Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2018-06-06 14:26:06 +0200
committerJan Beulich <jbeulich@suse.com>2018-06-06 14:26:06 +0200
commit52180e1c0a9e0bff23979375d01a3222f41f5fd3 (patch)
treee5e1eddfab8b4c224d22d3757bcbee0a588b284c
parent42aa4583a6838d32f94342f84e41efde291b65fb (diff)
xen/x86/entry/64: Don't use IST entry for #BP stack
(bsc#1087088). suse-commit: 9c9843bf16fc73fab6c23dc3eb5117bb99a63f5d
-rw-r--r--arch/x86/kernel/entry_64-xen.S2
-rw-r--r--arch/x86/kernel/traps-xen.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_64-xen.S b/arch/x86/kernel/entry_64-xen.S
index 981e04cbc96d..62710220e663 100644
--- a/arch/x86/kernel/entry_64-xen.S
+++ b/arch/x86/kernel/entry_64-xen.S
@@ -1183,7 +1183,7 @@ END(arch_unwind_init_running)
paranoidzeroentry_ist debug do_debug DEBUG_STACK
zeroentry nmi do_nmi_callback
-paranoidzeroentry_ist int3 do_int3 DEBUG_STACK
+zeroentry int3 do_int3
errorentry stack_segment do_stack_segment
errorentry general_protection do_general_protection
errorentry page_fault do_page_fault
diff --git a/arch/x86/kernel/traps-xen.c b/arch/x86/kernel/traps-xen.c
index 633945f4ed75..700fca2f7db7 100644
--- a/arch/x86/kernel/traps-xen.c
+++ b/arch/x86/kernel/traps-xen.c
@@ -471,7 +471,6 @@ void restart_nmi(void)
ignore_nmis--;
}
-/* May run on IST stack. */
dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
#ifdef CONFIG_KGDB_LOW_LEVEL_TRAP