diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-28 06:50:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:20:24 +0100 |
| commit | a21769a4461801454930a06bc18bd8249cd9e993 (patch) | |
| tree | 8b879f9a6d1c957d17a155ff865a0f7c8a18e257 /arch/x86/include/asm/mach-default | |
| parent | x86, apic: clean up ->cpu_to_logical_apicid() (diff) | |
| download | linux-dev-a21769a4461801454930a06bc18bd8249cd9e993.tar.xz linux-dev-a21769a4461801454930a06bc18bd8249cd9e993.zip | |
x86, apic: clean up ->cpu_present_to_apicid()
- separate the namespace
- remove macros
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/mach-default')
| -rw-r--r-- | arch/x86/include/asm/mach-default/mach_apic.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index eae3e4b6ed04..15d5627a9d6f 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h @@ -110,7 +110,7 @@ static inline int default_cpu_to_logical_apicid(int cpu) return 1 << cpu; } -static inline int cpu_present_to_apicid(int mps_cpu) +static inline int __default_cpu_present_to_apicid(int mps_cpu) { if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu)) return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); @@ -118,6 +118,15 @@ static inline int cpu_present_to_apicid(int mps_cpu) return BAD_APICID; } +#ifdef CONFIG_X86_32 +static inline int default_cpu_present_to_apicid(int mps_cpu) +{ + return __default_cpu_present_to_apicid(mps_cpu); +} +#else +extern int default_cpu_present_to_apicid(int mps_cpu); +#endif + static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) { return physid_mask_of_physid(phys_apicid); |