diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-15 03:29:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-15 03:29:44 -0400 |
commit | 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 (patch) | |
tree | 7e5f6d050b72ab08a4497e82a4a103fefb086e80 /arch/x86/kernel/apic/apic.c | |
parent | 56396e6823fe9b42fe9cf9403d6ed67756255f70 (diff) | |
parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) |
Merge commit 'v2.6.38' into x86/mm
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: Resolve the conflict, update the branch to .38.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 1390cf985af..306386fbc10 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -1403,12 +1403,17 @@ void __cpuinit end_local_APIC_setup(void) | |||
1403 | #endif | 1403 | #endif |
1404 | 1404 | ||
1405 | apic_pm_activate(); | 1405 | apic_pm_activate(); |
1406 | } | ||
1407 | |||
1408 | void __init bsp_end_local_APIC_setup(void) | ||
1409 | { | ||
1410 | end_local_APIC_setup(); | ||
1406 | 1411 | ||
1407 | /* | 1412 | /* |
1408 | * Now that local APIC setup is completed for BP, configure the fault | 1413 | * Now that local APIC setup is completed for BP, configure the fault |
1409 | * handling for interrupt remapping. | 1414 | * handling for interrupt remapping. |
1410 | */ | 1415 | */ |
1411 | if (!smp_processor_id() && intr_remapping_enabled) | 1416 | if (intr_remapping_enabled) |
1412 | enable_drhd_fault_handling(); | 1417 | enable_drhd_fault_handling(); |
1413 | 1418 | ||
1414 | } | 1419 | } |
@@ -1778,7 +1783,7 @@ int __init APIC_init_uniprocessor(void) | |||
1778 | enable_IO_APIC(); | 1783 | enable_IO_APIC(); |
1779 | #endif | 1784 | #endif |
1780 | 1785 | ||
1781 | end_local_APIC_setup(); | 1786 | bsp_end_local_APIC_setup(); |
1782 | 1787 | ||
1783 | #ifdef CONFIG_X86_IO_APIC | 1788 | #ifdef CONFIG_X86_IO_APIC |
1784 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) | 1789 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) |