projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/kernel/linux-starfive.git]
/
arch
/
x86
/
entry
/
entry_64.S
diff --git
a/arch/x86/entry/entry_64.S
b/arch/x86/entry/entry_64.S
index
aa15b4c
..
ff6f802
100644
(file)
--- a/
arch/x86/entry/entry_64.S
+++ b/
arch/x86/entry/entry_64.S
@@
-1264,7
+1264,7
@@
idtentry async_page_fault do_async_page_fault has_error_code=1
#endif
#ifdef CONFIG_X86_MCE
-idtentry machine_check
has_error_code=0 paranoid=1 do_sym=*machine_check_vector(%rip)
+idtentry machine_check
do_mce has_error_code=0 paranoid=1
#endif
/*