diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-07-06 11:16:48 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-06 11:16:48 -0700 |
| commit | c1c767d29bb2390308a35b69957b874e9446fe3b (patch) | |
| tree | 6014e0b0838b2536c72452be4c5f5b2102922d04 /arch/x86/kernel/head64.c | |
| parent | 2cb9802eeb7f919f97df05b16ec128f4f5af366d (diff) | |
| parent | 165797d05c15ab87ef7421c63a076ffa8477cbe4 (diff) | |
Merge tag 'v3.14.45' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14lsk-v3.14-15.07
This is the 3.14.45 stable release
Diffstat (limited to 'arch/x86/kernel/head64.c')
| -rw-r--r-- | arch/x86/kernel/head64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 85126ccbdf6b..5fc4ac7c6582 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -162,7 +162,7 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data) clear_bss(); for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) - set_intr_gate(i, early_idt_handlers[i]); + set_intr_gate(i, early_idt_handler_array[i]); load_idt((const struct desc_ptr *)&idt_descr); copy_bootdata(__va(real_mode_data)); |