summaryrefslogtreecommitdiffstats
path: root/arch/x86/cpu/interrupts.c
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2016-05-22 01:45:33 -0700
committerBin Meng <bmeng.cn@gmail.com>2016-05-23 15:27:41 +0800
commite2126711af40ae669610d3500fe23c81b7ad6307 (patch)
treec3ce06397c65d34b261e2dba02b020a66b5b2090 /arch/x86/cpu/interrupts.c
parentaaaa55751ab1e5a5cfa0962d604593a7e6f33ff6 (diff)
downloadtalos-obmc-uboot-e2126711af40ae669610d3500fe23c81b7ad6307.tar.gz
talos-obmc-uboot-e2126711af40ae669610d3500fe23c81b7ad6307.zip
x86: Call lapic_setup() in interrupt_init()
Let's configure LAPIC in a common place - interrupt_init(). Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/cpu/interrupts.c')
-rw-r--r--arch/x86/cpu/interrupts.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index 10dc4d47f0..dd2819a12c 100644
--- a/arch/x86/cpu/interrupts.c
+++ b/arch/x86/cpu/interrupts.c
@@ -15,14 +15,14 @@
#include <dm.h>
#include <asm/cache.h>
#include <asm/control_regs.h>
+#include <asm/i8259.h>
#include <asm/interrupt.h>
#include <asm/io.h>
-#include <asm/processor-flags.h>
-#include <linux/compiler.h>
+#include <asm/lapic.h>
#include <asm/msr.h>
+#include <asm/processor-flags.h>
#include <asm/processor.h>
#include <asm/u-boot-x86.h>
-#include <asm/i8259.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -266,6 +266,8 @@ int interrupt_init(void)
i8259_init();
#endif
+ lapic_setup();
+
/* Initialize core interrupt and exception functionality of CPU */
cpu_init_interrupts();
OpenPOWER on IntegriCloud