diff options
| author | Ingo Molnar | 2018-03-27 08:43:39 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-03-27 08:43:39 +0200 |
| commit | 0bc91d4ba77156ae9217d25ed7c434540f950d05 (patch) | |
| tree | 949c1acf27b106184d8842586740fbbcc9c9ea62 /arch/x86/entry/entry_64.S | |
| parent | x86/mm: Remove pointless checks in vmalloc_fault (diff) | |
| parent | Linux 4.16-rc7 (diff) | |
| download | kernel-qcow2-linux-0bc91d4ba77156ae9217d25ed7c434540f950d05.tar.gz kernel-qcow2-linux-0bc91d4ba77156ae9217d25ed7c434540f950d05.tar.xz kernel-qcow2-linux-0bc91d4ba77156ae9217d25ed7c434540f950d05.zip | |
Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/entry_64.S')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 74180b3d43bd..936e19642eab 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1143,7 +1143,7 @@ apicinterrupt3 HYPERV_REENLIGHTENMENT_VECTOR \ #endif /* CONFIG_HYPERV */ idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK -idtentry int3 do_int3 has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK +idtentry int3 do_int3 has_error_code=0 idtentry stack_segment do_stack_segment has_error_code=1 #ifdef CONFIG_XEN |