diff options
author | Keir Fraser <keir@xen.org> | 2010-12-15 11:52:14 +0000 |
---|---|---|
committer | Keir Fraser <keir@xen.org> | 2010-12-15 11:52:14 +0000 |
commit | 06e127fc275cd524a0f1dc8e2fa974de46619c10 (patch) | |
tree | 5e977d91b0ef7c0c7262b56ead3e643db217a8fb /xen/include/asm-x86/mach-generic | |
parent | bc14e5d1e010afad8b8b93ec462088e1d271ce8e (diff) | |
download | xen-06e127fc275cd524a0f1dc8e2fa974de46619c10.tar.gz xen-06e127fc275cd524a0f1dc8e2fa974de46619c10.tar.bz2 xen-06e127fc275cd524a0f1dc8e2fa974de46619c10.zip |
x86: mpparse and cstate need to use 32bit apic id
Instead of going with mpc_config_processor struct.
that field ony have 8 bits.
We should not change that struct, because it is shared with mptable.
Also need to increase MAX_APICS.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Rather than using a fixed value of 512, make this scale with NR_CPUS
(which obviously still doesn't cover all theoretically possible
systems, but at least allows some build time control).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/include/asm-x86/mach-generic')
-rw-r--r-- | xen/include/asm-x86/mach-generic/mach_apic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/include/asm-x86/mach-generic/mach_apic.h b/xen/include/asm-x86/mach-generic/mach_apic.h index 845f25536b..83783b3546 100644 --- a/xen/include/asm-x86/mach-generic/mach_apic.h +++ b/xen/include/asm-x86/mach-generic/mach_apic.h @@ -28,15 +28,15 @@ static inline void enable_apic_mode(void) extern u32 bios_cpu_apicid[]; -static inline int mpc_apic_id(struct mpc_config_processor *m, +static inline int mpc_apic_id(struct mpc_config_processor *m, u32 apicid, struct mpc_config_translation *translation_record) { printk("Processor #%d %d:%d APIC version %d\n", - m->mpc_apicid, + apicid, (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8, (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, m->mpc_apicver); - return (m->mpc_apicid); + return apicid; } static inline int multi_timer_check(int apic, int irq) |