diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-11 21:44:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 02:45:14 -0400 |
commit | 4c9961d56ec20c27ec5d02e49fd7427748312741 (patch) | |
tree | e3a0fd508aae031dcd06705a2ce77f7dd0a68c11 /arch/x86/kernel/apic_32.c | |
parent | 4696ca5bfd2697f5686f96d59cf0b6de14869b4e (diff) |
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/apic_32.c')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 7413354c9ffd..47ff978aecfd 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -1230,7 +1230,7 @@ void __init init_apic_mappings(void) | |||
1230 | * default configuration (or the MP table is broken). | 1230 | * default configuration (or the MP table is broken). |
1231 | */ | 1231 | */ |
1232 | if (boot_cpu_physical_apicid == -1U) | 1232 | if (boot_cpu_physical_apicid == -1U) |
1233 | boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); | 1233 | boot_cpu_physical_apicid = read_apic_id(); |
1234 | 1234 | ||
1235 | } | 1235 | } |
1236 | 1236 | ||
@@ -1270,7 +1270,7 @@ int __init APIC_init_uniprocessor(void) | |||
1270 | * might be zero if read from MP tables. Get it from LAPIC. | 1270 | * might be zero if read from MP tables. Get it from LAPIC. |
1271 | */ | 1271 | */ |
1272 | #ifdef CONFIG_CRASH_DUMP | 1272 | #ifdef CONFIG_CRASH_DUMP |
1273 | boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); | 1273 | boot_cpu_physical_apicid = read_apic_id(); |
1274 | #endif | 1274 | #endif |
1275 | physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); | 1275 | physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); |
1276 | 1276 | ||