linux-next: build failure after merge of the final tree (akpm tree related)

Hi all,

After merging the final tree, today's linux-next build (i386 defconfig)
failed like this:

In file included from arch/x86/include/asm/elf.h:90:0,
                 from include/linux/elf.h:7,
                 from arch/x86/kernel/cpu/amd.c:4:
arch/x86/include/asm/desc.h: In function 'native_set_ldt':
arch/x86/include/asm/desc.h:199:3: error: implicit declaration of function 'this_cpu_read' [-Werror=implicit-function-declaration]

Caused by commit a65a3870c856 ("x86: use this_cpu_xxx to replace percpu_xxx funcs").

I tried changing the include of asm/percpu.h to linux/percpu.h in
arch/x86/include/asm/smp.h (the above is caused by smp_processor_id()
using this_cpu_read()), but that made things worse.  So I added an
include of linux/percpu.h to arch/x86/include/asm/desc.h (but this seems
a bit fragile).

From: Stephen Rothwell <redacted>
Date: Fri, 20 Jan 2012 12:51:40 +1100
Subject: [PATCH] percpu: x86: fix smp_processor_id's need for this_cpu_read

Signed-off-by: Stephen Rothwell <redacted>
---
 arch/x86/include/asm/desc.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index e95822d..3072a2d 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h

@@ -6,6 +6,7 @@
 #include <asm/mmu.h>
 
 #include <linux/smp.h>
+#include <linux/percpu.h>
 
 static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *info)
 {

-- 
1.7.9.rc0.23.g7e521

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au