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
/
enlighten_pv.c
diff --git
a/arch/x86/xen/enlighten_pv.c
b/arch/x86/xen/enlighten_pv.c
index
3e04f2b
..
49352fa
100644
(file)
--- a/
arch/x86/xen/enlighten_pv.c
+++ b/
arch/x86/xen/enlighten_pv.c
@@
-694,7
+694,7
@@
static struct trap_array_entry trap_array[] = {
TRAP_ENTRY(exc_coprocessor_error, false ),
TRAP_ENTRY(exc_alignment_check, false ),
TRAP_ENTRY(exc_simd_coprocessor_error, false ),
-#ifdef CONFIG_X86_
KERNEL_IB
T
+#ifdef CONFIG_X86_
CE
T
TRAP_ENTRY(exc_control_protection, false ),
#endif
};