diff options
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) | |||
182 | return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); | 182 | return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); |
183 | } | 183 | } |
184 | 184 | ||
185 | #include <mach_apicdef.h> | ||
186 | static inline unsigned int read_apic_id(void) | ||
187 | { | ||
188 | unsigned int reg; | ||
189 | |||
190 | reg = *(u32 *)(APIC_BASE + APIC_ID); | ||
191 | |||
192 | return GET_APIC_ID(reg); | ||
193 | } | ||
194 | #endif | 185 | #endif |
195 | 186 | ||
196 | |||
197 | # if defined(APIC_DEFINITION) || defined(CONFIG_X86_64) | ||
198 | extern int hard_smp_processor_id(void); | 187 | extern int hard_smp_processor_id(void); |
199 | # else | ||
200 | #include <mach_apicdef.h> | ||
201 | static inline int hard_smp_processor_id(void) | ||
202 | { | ||
203 | /* we don't want to mark this access volatile - bad code generation */ | ||
204 | return read_apic_id(); | ||
205 | } | ||
206 | # endif /* APIC_DEFINITION */ | ||
207 | 188 | ||
208 | #else /* CONFIG_X86_LOCAL_APIC */ | 189 | #else /* CONFIG_X86_LOCAL_APIC */ |
209 | 190 | ||