mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

x86: don't use MP_processor_info for ACPI mode

Browse source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy 2008-03-27 23:54:20 +03:00 committed by Ingo Molnar
parent c853c67690
commit 08bef9d337
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/x86/kernel/mpparse_32.c
View file

@ -114,7 +114,6 @@ static void __cpuinit generic_processor_info(int apicid, int version)
int cpu; int cpu;
cpumask_t tmp_map; cpumask_t tmp_map;
physid_mask_t phys_cpu; physid_mask_t phys_cpu;
/* /*
* Validate version * Validate version
@ -893,34 +892,18 @@ void __init mp_register_lapic_address(u64 address)
void __cpuinit mp_register_lapic (u8 id, u8 enabled) void __cpuinit mp_register_lapic (u8 id, u8 enabled)
{ {
struct mpc_config_processor processor;
int boot_cpu = 0;
if (MAX_APICS - id <= 0) { if (MAX_APICS - id <= 0) {
printk(KERN_WARNING "Processor #%d invalid (max %d)\n", printk(KERN_WARNING "Processor #%d invalid (max %d)\n",
id, MAX_APICS); id, MAX_APICS);
return; return;
} }
if (!enabled) { if (!enabled) {
++disabled_cpus; ++disabled_cpus;
return; return;
} }
if (id == boot_cpu_physical_apicid) generic_processor_info(id, GET_APIC_VERSION(apic_read(APIC_LVR)));
boot_cpu = 1;
processor.mpc_type = MP_PROCESSOR;
processor.mpc_apicid = id;
processor.mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR));
processor.mpc_cpuflag = (enabled ? CPU_ENABLED : 0);
processor.mpc_cpuflag |= (boot_cpu ? CPU_BOOTPROCESSOR : 0);
processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) |
(boot_cpu_data.x86_model << 4) | boot_cpu_data.x86_mask;
processor.mpc_featureflag = boot_cpu_data.x86_capability[0];
processor.mpc_reserved[0] = 0;
processor.mpc_reserved[1] = 0;
MP_processor_info(&processor);
} }
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC