Commit bc916e67 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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

parents b037b09b bd87e6f6

arch/x86/entry/common.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include <trace/events/syscalls.h>



/* 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)) {

		/*
@@ -294,7 +294,7 @@ static void __prepare_exit_to_usermode(struct pt_regs *regs) 
#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();

	__prepare_exit_to_usermode(regs);

arch/x86/include/asm/idtentry.h

+2 −2
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_MC, exc_machine_check); 


/* 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);

#endif
@@ -567,7 +567,7 @@ DECLARE_IDTENTRY_DEBUG(X86_TRAP_DB, exc_debug); 
#else

DECLARE_IDTENTRY_RAW(X86_TRAP_DB,	exc_debug);

#endif

#ifdef CONFIG_XEN_PV

#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)

DECLARE_IDTENTRY_RAW(X86_TRAP_DB,	xenpv_exc_debug);

#endif

arch/x86/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ DEFINE_IDTENTRY_ERRORCODE(exc_alignment_check) 


	do_trap(X86_TRAP_AC, SIGBUS, "alignment check", regs,

		error_code, BUS_ADRALN, NULL);



	local_irq_disable();

}



#ifdef CONFIG_VMAP_STACK