diff options
| author | Greg Kroah-Hartman | 2018-03-28 12:27:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-03-28 12:27:35 +0200 |
| commit | b24d0d5b12a678b96676348976982686fbe222b4 (patch) | |
| tree | 565ce37d2d971cb94436241bc2ac48028b6b66d0 /arch/x86/entry/entry_64.S | |
| parent | eeprom: at24: use SPDX identifier instead of GPL boiler-plate (diff) | |
| parent | Linux 4.16-rc7 (diff) | |
| download | kernel-qcow2-linux-b24d0d5b12a678b96676348976982686fbe222b4.tar.gz kernel-qcow2-linux-b24d0d5b12a678b96676348976982686fbe222b4.tar.xz kernel-qcow2-linux-b24d0d5b12a678b96676348976982686fbe222b4.zip | |
Merge 4.16-rc7 into char-misc-next
We want the hyperv fix in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 5a11e324eacc..f19b43e77028 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1141,7 +1141,7 @@ apicinterrupt3 HYPERV_STIMER0_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 |