From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759173AbYAHCNm (ORCPT ); Mon, 7 Jan 2008 21:13:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757032AbYAHCLz (ORCPT ); Mon, 7 Jan 2008 21:11:55 -0500 Received: from relay1.sgi.com ([192.48.171.29]:57797 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754658AbYAHCLr (ORCPT ); Mon, 7 Jan 2008 21:11:47 -0500 Message-Id: <20080108021143.581044000@sgi.com> References: <20080108021142.585467000@sgi.com> User-Agent: quilt/0.46-1 Date: Mon, 07 Jan 2008 18:11:47 -0800 From: travis@sgi.com To: mingo@elte.hu, Andrew Morton , Andi Kleen , Christoph Lameter Cc: Jack Steiner , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Rusty Russell , tglx@linutronix.de, mingo@redhat.com Subject: [PATCH 05/10] x86_64: Use generic percpu Content-Disposition: inline; filename=x86_64_use_generic_percpu Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org x86_64 provides an optimized way to determine the local per cpu area offset through the pda and determines the base by accessing a remote pda. Cc: Rusty Russell Cc: Andi Kleen Cc: tglx@linutronix.de Cc: mingo@redhat.com Signed-off-by: Christoph Lameter Signed-off-by: Mike Travis --- include/asm-x86/percpu_64.h | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) --- a/include/asm-x86/percpu_64.h +++ b/include/asm-x86/percpu_64.h @@ -12,21 +12,10 @@ #include #define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset) -#define __my_cpu_offset() read_pda(data_offset) +#define __my_cpu_offset read_pda(data_offset) #define per_cpu_offset(x) (__per_cpu_offset(x)) -/* var is in discarded region: offset to particular copy we want */ -#define per_cpu(var, cpu) (*({ \ - extern int simple_identifier_##var(void); \ - RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); })) -#define __get_cpu_var(var) (*({ \ - extern int simple_identifier_##var(void); \ - RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); })) -#define __raw_get_cpu_var(var) (*({ \ - extern int simple_identifier_##var(void); \ - RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); })) - /* A macro to avoid #include hell... */ #define percpu_modcopy(pcpudst, src, size) \ do { \ @@ -36,16 +25,8 @@ do { \ (src), (size)); \ } while (0) -extern void setup_per_cpu_areas(void); - -#else /* ! SMP */ - -#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) -#define __get_cpu_var(var) per_cpu__##var -#define __raw_get_cpu_var(var) per_cpu__##var - #endif /* SMP */ -#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name +#include #endif /* _ASM_X8664_PERCPU_H_ */ --