diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:50:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:50:10 +0100 |
| commit | c550033ced484d8d333bc1edc0a482728680e689 (patch) | |
| tree | f5e10a2879a2a446be8d4aefb385cd6845c19c72 /arch/x86/include | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
| parent | 7a46c594bf7f1f2eeb1e12d4b857d5f581957a92 (diff) | |
Merge branch 'core/percpu' into x86/core
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/percpu.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 8f1d2fbec1d..aee103b26d0 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -43,14 +43,6 @@ #else /* ...!ASSEMBLY */ #include <linux/stringify.h> -#include <asm/sections.h> - -#define __addr_to_pcpu_ptr(addr) \ - (void *)((unsigned long)(addr) - (unsigned long)pcpu_base_addr \ - + (unsigned long)__per_cpu_start) -#define __pcpu_ptr_to_addr(ptr) \ - (void *)((unsigned long)(ptr) + (unsigned long)pcpu_base_addr \ - - (unsigned long)__per_cpu_start) #ifdef CONFIG_SMP #define __percpu_arg(x) "%%"__stringify(__percpu_seg)":%P" #x |