tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86/urgent' into x86/entry to pick up upstream fixes.
+6
-4
+2
-2
arch/x86/entry/common.c
+2
-2
arch/x86/entry/common.c
···
46
46
#include <trace/events/syscalls.h>
47
47
48
48
/* Check that the stack and regs on entry from user mode are sane. */
49
-
static void check_user_regs(struct pt_regs *regs)
49
+
static noinstr void check_user_regs(struct pt_regs *regs)
50
50
{
51
51
if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) {
52
52
/*
···
294
294
#endif
295
295
}
296
296
297
-
__visible noinstr void prepare_exit_to_usermode(struct pt_regs *regs)
297
+
static noinstr void prepare_exit_to_usermode(struct pt_regs *regs)
298
298
{
299
299
instrumentation_begin();
300
300
__prepare_exit_to_usermode(regs);
+2
-2
arch/x86/include/asm/idtentry.h
+2
-2
arch/x86/include/asm/idtentry.h
···
557
557
558
558
/* NMI */
559
559
DECLARE_IDTENTRY_NMI(X86_TRAP_NMI, exc_nmi);
560
-
#ifdef CONFIG_XEN_PV
560
+
#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)
561
561
DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi);
562
562
#endif
563
563
···
567
567
#else
568
568
DECLARE_IDTENTRY_RAW(X86_TRAP_DB, exc_debug);
569
569
#endif
570
-
#ifdef CONFIG_XEN_PV
570
+
#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)
571
571
DECLARE_IDTENTRY_RAW(X86_TRAP_DB, xenpv_exc_debug);
572
572
#endif
573
573