diff options
Diffstat (limited to 'include/asm-x86/smp_64.h')
-rw-r--r-- | include/asm-x86/smp_64.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h index c53a011bb91c..25206333476b 100644 --- a/include/asm-x86/smp_64.h +++ b/include/asm-x86/smp_64.h | |||
@@ -52,12 +52,16 @@ static inline int logical_smp_processor_id(void) | |||
52 | return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); | 52 | return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); |
53 | } | 53 | } |
54 | 54 | ||
55 | #include <mach_apicdef.h> | 55 | # ifdef APIC_DEFINITION |
56 | extern int hard_smp_processor_id(void); | ||
57 | # else | ||
58 | # include <mach_apicdef.h> | ||
56 | static inline int hard_smp_processor_id(void) | 59 | static inline int hard_smp_processor_id(void) |
57 | { | 60 | { |
58 | /* we don't want to mark this access volatile - bad code generation */ | 61 | /* we don't want to mark this access volatile - bad code generation */ |
59 | return GET_APIC_ID(*(u32 *)(APIC_BASE + APIC_ID)); | 62 | return GET_APIC_ID(*(u32 *)(APIC_BASE + APIC_ID)); |
60 | } | 63 | } |
64 | # endif /* APIC_DEFINITION */ | ||
61 | 65 | ||
62 | #endif | 66 | #endif |
63 | 67 | ||