leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'x86/urgent' into x86/entry to pick up upstream fixes.

Browse Source
This commit is contained in:
Thomas Gleixner
2020-07-10 11:45:22 +02:00
parent b037b09b90 bd87e6f661
commit bc916e67c0
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/entry/common.c
View File

@@ -46,7 +46,7 @@
#include <trace/events/syscalls.h> #include <trace/events/syscalls.h>
/* Check that the stack and regs on entry from user mode are sane. */ /* Check that the stack and regs on entry from user mode are sane. */
static void check_user_regs(struct pt_regs *regs) static noinstr void check_user_regs(struct pt_regs *regs)
{ {
if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) { if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) {
/* /*
@@ -294,7 +294,7 @@ static void __prepare_exit_to_usermode(struct pt_regs *regs)
#endif #endif
} }
__visible noinstr void prepare_exit_to_usermode(struct pt_regs *regs) static noinstr void prepare_exit_to_usermode(struct pt_regs *regs)
{ {
instrumentation_begin(); instrumentation_begin();
__prepare_exit_to_usermode(regs); __prepare_exit_to_usermode(regs);

4
arch/x86/include/asm/idtentry.h
View File

@@ -557,7 +557,7 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_MC, exc_machine_check);
/* NMI */ /* NMI */
DECLARE_IDTENTRY_NMI(X86_TRAP_NMI, exc_nmi); DECLARE_IDTENTRY_NMI(X86_TRAP_NMI, exc_nmi);
#ifdef CONFIG_XEN_PV #if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)
DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi); DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi);
#endif #endif
@@ -567,7 +567,7 @@ DECLARE_IDTENTRY_DEBUG(X86_TRAP_DB, exc_debug);
#else #else
DECLARE_IDTENTRY_RAW(X86_TRAP_DB, exc_debug); DECLARE_IDTENTRY_RAW(X86_TRAP_DB, exc_debug);
#endif #endif
#ifdef CONFIG_XEN_PV #if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)
DECLARE_IDTENTRY_RAW(X86_TRAP_DB, xenpv_exc_debug); DECLARE_IDTENTRY_RAW(X86_TRAP_DB, xenpv_exc_debug);
#endif #endif

2
arch/x86/kernel/traps.c
View File

@@ -303,6 +303,8 @@ DEFINE_IDTENTRY_ERRORCODE(exc_alignment_check)
do_trap(X86_TRAP_AC, SIGBUS, "alignment check", regs, do_trap(X86_TRAP_AC, SIGBUS, "alignment check", regs,
error_code, BUS_ADRALN, NULL); error_code, BUS_ADRALN, NULL);
local_irq_disable();
} }
#ifdef CONFIG_VMAP_STACK #ifdef CONFIG_VMAP_STACK