aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@intel.com>2009-11-09 11:27:04 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-19 16:25:17 -0800
commitb81bb373a7e832a43921356aa1291044d7f52fb1 (patch)
tree8008f5c30cae5bf5d8480b590cee63db01034333 /arch/x86/kernel/smpboot.c
parentef3548668c02cc8c3922f4423f32b53e662811c6 (diff)
downloadkernel_samsung_smdk4412-b81bb373a7e832a43921356aa1291044d7f52fb1.tar.gz
kernel_samsung_smdk4412-b81bb373a7e832a43921356aa1291044d7f52fb1.tar.bz2
kernel_samsung_smdk4412-b81bb373a7e832a43921356aa1291044d7f52fb1.zip
x86, pic: Make use of legacy_pic abstraction
This patch replaces legacy PIC-related global variable and functions with the new legacy_pic abstraction. Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com> LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D04@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 3e6150d421e..f7a52f4a21a 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -68,6 +68,7 @@
#include <linux/mc146818rtc.h>
#include <asm/smpboot_hooks.h>
+#include <asm/i8259.h>
#ifdef CONFIG_X86_32
u8 apicid_2_node[MAX_APICID];
@@ -287,9 +288,9 @@ notrace static void __cpuinit start_secondary(void *unused)
check_tsc_sync_target();
if (nmi_watchdog == NMI_IO_APIC) {
- disable_8259A_irq(0);
+ legacy_pic->chip->mask(0);
enable_NMI_through_LVT0();
- enable_8259A_irq(0);
+ legacy_pic->chip->unmask(0);
}
#ifdef CONFIG_X86_32