diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
| commit | 6d54868eeb2697c9a905c4d3521efbacc44c5258 (patch) | |
| tree | 6ad3ae03a0083d1a50a6152bd6dcad5630ce7823 /arch/x86/cpu/interrupts.c | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| parent | 8216b11cdd50515fbc423a4b2709a00865b8621d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/interrupts.c')
| -rw-r--r-- | arch/x86/cpu/interrupts.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c index 10dc4d47f06..dd2819a12c7 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(); |