diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:35 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:35 -0500 |
commit | 64883ab0e3386d72112a9091d886352a7b4b8bf6 (patch) | |
tree | 6adf29b7f7fae6d10d173ece49c5fc9990100b29 /include/asm-x86/mach-default | |
parent | d291cf83639a0e0b67ff783b6ed29c0a747d4901 (diff) |
x86: cleanup mpspec variants
Bring the mpspec variants into sync to prepare merging and
paravirt support.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/mach-default')
-rw-r--r-- | include/asm-x86/mach-default/mach_apic.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h index 6db1c3babe9a..e3c2c1012c1c 100644 --- a/include/asm-x86/mach-default/mach_apic.h +++ b/include/asm-x86/mach-default/mach_apic.h | |||
@@ -89,15 +89,15 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) | |||
89 | return physid_mask_of_physid(phys_apicid); | 89 | return physid_mask_of_physid(phys_apicid); |
90 | } | 90 | } |
91 | 91 | ||
92 | static inline int mpc_apic_id(struct mpc_config_processor *m, | 92 | static inline int mpc_apic_id(struct mpc_config_processor *m, |
93 | struct mpc_config_translation *translation_record) | 93 | struct mpc_config_translation *translation_record) |
94 | { | 94 | { |
95 | printk("Processor #%d %ld:%ld APIC version %d\n", | 95 | printk("Processor #%d %u:%u APIC version %d\n", |
96 | m->mpc_apicid, | 96 | m->mpc_apicid, |
97 | (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8, | 97 | (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8, |
98 | (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, | 98 | (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, |
99 | m->mpc_apicver); | 99 | m->mpc_apicver); |
100 | return (m->mpc_apicid); | 100 | return m->mpc_apicid; |
101 | } | 101 | } |
102 | 102 | ||
103 | static inline void setup_portio_remap(void) | 103 | static inline void setup_portio_remap(void) |