diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-11 18:44:16 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 08:45:14 +0200 |
| commit | 4c9961d56ec20c27ec5d02e49fd7427748312741 (patch) | |
| tree | e3a0fd508aae031dcd06705a2ce77f7dd0a68c11 /arch/x86/kernel/acpi/boot.c | |
| parent | 4696ca5bfd2697f5686f96d59cf0b6de14869b4e (diff) | |
| download | op-kernel-dev-4c9961d56ec20c27ec5d02e49fd7427748312741.zip op-kernel-dev-4c9961d56ec20c27ec5d02e49fd7427748312741.tar.gz | |
x86: make read_apic_id return final apicid
also remove GET_APIC_ID when read_apic_id is used.
need to apply after
[PATCH] x86: mach_apicdef.h need to include before smp.h
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 8705262..b314bcd 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -761,7 +761,7 @@ static void __init acpi_register_lapic_address(unsigned long address) set_fixmap_nocache(FIX_APIC_BASE, address); if (boot_cpu_physical_apicid == -1U) { - boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); + boot_cpu_physical_apicid = read_apic_id(); #ifdef CONFIG_X86_32 apic_version[boot_cpu_physical_apicid] = GET_APIC_VERSION(apic_read(APIC_LVR)); |
