From mboxrd@z Thu Jan 1 00:00:00 1970 From: "H. Peter Anvin" Subject: Re: linux-next: build failure after merge of the akpm tree Date: Sun, 26 Feb 2012 22:31:11 -0800 Message-ID: <4F4B232F.2070605@zytor.com> References: <20120227172139.726ddae85c910cee7b7e3a37@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Received: from terminus.zytor.com ([198.137.202.10]:44130 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754028Ab2B0Gbp (ORCPT ); Mon, 27 Feb 2012 01:31:45 -0500 In-Reply-To: <20120227172139.726ddae85c910cee7b7e3a37@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alex Shi , Thomas Gleixner , Ingo Molnar , Peter Zijlstra On 02/26/2012 10:21 PM, Stephen Rothwell wrote: > > I applied the following fix up patch. > > From: Stephen Rothwell Date: Mon, 27 Feb > 2012 17:12:00 +1100 Subject: [PATCH] percpu: fix for removal of > percpu_xxx function > > Signed-off-by: Stephen Rothwell --- > 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); Acked-by: H. Peter Anvin -hpa -- H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.