summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-02-25 23:33:26 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-06-11 15:14:59 +0200
commit2bbc68f8373c0631ebf137f376fbea00e8086be7 (patch)
tree0cebf75fb72ec79233f04adc8903bda6c7a11f23 /arch/x86/xen
parent9f58fdde95c9509a4ded27a6d0035e79294002b4 (diff)
downloadlinux-stable-2bbc68f8373c0631ebf137f376fbea00e8086be7.tar.gz
linux-stable-2bbc68f8373c0631ebf137f376fbea00e8086be7.tar.bz2
linux-stable-2bbc68f8373c0631ebf137f376fbea00e8086be7.zip
x86/entry: Convert Debug exception to IDTENTRY_DB
Convert #DB to IDTENTRY_ERRORCODE: - Implement the C entry point with DEFINE_IDTENTRY_DB - Emit the ASM stub with DECLARE_IDTENTRY - Remove the ASM idtentry in 64bit - Remove the open coded ASM entry code in 32bit - Fixup the XEN/PV code - Remove the old prototypes No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Andy Lutomirski <luto@kernel.org> Link: https://lkml.kernel.org/r/20200505135314.900297476@linutronix.de
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/enlighten_pv.c2
-rw-r--r--arch/x86/xen/xen-asm_64.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 0d6c2789e676..376851d1039a 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -615,7 +615,7 @@ struct trap_array_entry {
.ist_okay = ist_ok }
static struct trap_array_entry trap_array[] = {
- { debug, xen_xendebug, true },
+ TRAP_ENTRY_REDIR(exc_debug, exc_xendebug, true ),
{ double_fault, xen_double_fault, true },
#ifdef CONFIG_X86_MCE
TRAP_ENTRY(exc_machine_check, true ),
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
index 04fa01b096ee..9999ea377476 100644
--- a/arch/x86/xen/xen-asm_64.S
+++ b/arch/x86/xen/xen-asm_64.S
@@ -29,8 +29,8 @@ _ASM_NOKPROBE(xen_\name)
.endm
xen_pv_trap asm_exc_divide_error
-xen_pv_trap debug
-xen_pv_trap xendebug
+xen_pv_trap asm_exc_debug
+xen_pv_trap asm_exc_xendebug
xen_pv_trap asm_exc_int3
xen_pv_trap asm_exc_xennmi
xen_pv_trap asm_exc_overflow