OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[tomoyo/tomoyo-test1.git]
/
arch
/
x86
/
xen
/
xen-asm.S
diff --git
a/arch/x86/xen/xen-asm.S
b/arch/x86/xen/xen-asm.S
index
08f1ceb
..
9e5e680
100644
(file)
--- a/
arch/x86/xen/xen-asm.S
+++ b/
arch/x86/xen/xen-asm.S
@@
-148,7
+148,7
@@
xen_pv_trap asm_exc_page_fault
xen_pv_trap asm_exc_spurious_interrupt_bug
xen_pv_trap asm_exc_coprocessor_error
xen_pv_trap asm_exc_alignment_check
-#ifdef CONFIG_X86_
KERNEL_IB
T
+#ifdef CONFIG_X86_
CE
T
xen_pv_trap asm_exc_control_protection
#endif
#ifdef CONFIG_X86_MCE