diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:55:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:16:42 +0100 |
| commit | 1dcdd3d15ecea0c22a09d4d001a39d425fceff2c (patch) | |
| tree | 91419ae421b2d1cac6297c9671eac2ff7723d7c2 /arch/x86/include/asm/smp.h | |
| parent | x86, summit: consolidate code, fix (diff) | |
| download | linux-dev-1dcdd3d15ecea0c22a09d4d001a39d425fceff2c.tar.xz linux-dev-1dcdd3d15ecea0c22a09d4d001a39d425fceff2c.zip | |
x86: remove mach_apic.h
Spread mach_apic.h definitions into genapic.h. (with some knock-on effects
on smp.h and apic.h.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d4ac4de4bcec..47d0e21f2b9e 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -173,8 +173,6 @@ extern int safe_smp_processor_id(void); #endif -#include <asm/genapic.h> - #ifdef CONFIG_X86_LOCAL_APIC #ifndef CONFIG_X86_64 @@ -184,26 +182,9 @@ static inline int logical_smp_processor_id(void) return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); } -static inline unsigned int read_apic_id(void) -{ - unsigned int reg; - - reg = *(u32 *)(APIC_BASE + APIC_ID); - - return apic->get_apic_id(reg); -} #endif - -# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64) extern int hard_smp_processor_id(void); -# else -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 */ |