diff options
| author | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
| commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
| tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch/x86/include/asm/smp.h | |
| parent | Merge branch 'linus' into perfcounters/core (diff) | |
| parent | Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86... (diff) | |
| download | kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.gz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.xz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.zip | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/x86/include/asm/smp.h')
| -rw-r--r-- | arch/x86/include/asm/smp.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 45ef8a1b9d7c..47d0e21f2b9e 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -182,28 +182,9 @@ static inline int logical_smp_processor_id(void) return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); } -#include <mach_apicdef.h> -static inline unsigned int read_apic_id(void) -{ - unsigned int reg; - - reg = *(u32 *)(APIC_BASE + APIC_ID); - - return GET_APIC_ID(reg); -} #endif - -# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64) extern int hard_smp_processor_id(void); -# else -#include <mach_apicdef.h> -static inline int hard_smp_processor_id(void) -{ - /* we don't want to mark this access volatile - bad code generation */ - return read_apic_id(); -} -# endif /* APIC_DEFINITION */ #else /* CONFIG_X86_LOCAL_APIC */ |