linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

Hi Andrew,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/compat.h:18:0,
                 from arch/x86/include/asm/ia32.h:7,
                 from arch/x86/include/asm/sigframe.h:17,
                 from arch/x86/kernel/asm-offsets.c:16:
arch/x86/include/asm/compat.h: In function 'arch_compat_alloc_user_space':
arch/x86/include/asm/compat.h:232:3: error: implicit declaration of function 'percpu_read' [-Werror=implicit-function-declaration]

Caused by commit d1a797f388d6 ("x32: Handle process creation") from the
tip tree interacting with commit 30999a95d190 ("percpu: remove percpu_xxx()
functions") from the akpm tree.

I applied the following fix up patch.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 27 Feb 2012 17:12:00 +1100
Subject: [PATCH] percpu: fix for removal of percpu_xxx function

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/x86/include/asm/compat.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index e7f68b4..b6a2a1c 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -229,7 +229,7 @@ static inline void __user *arch_compat_alloc_user_space(long len)
 		sp = task_pt_regs(current)->sp;
 	} else {
 		/* -128 for the x32 ABI redzone */
-		sp = percpu_read(old_rsp) - 128;
+		sp = __this_cpu_read(old_rsp) - 128;
 	}
 
 	return (void __user *)round_down(sp - len, 16);
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature