tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'x86_entry_for_6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 entry update from Dave Hansen:
"This one is pretty trivial: fix a badly-named FRED data structure
member"

* tag 'x86_entry_for_6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/fred: Fix 64bit identifier in fred_ss

Linus Torvalds a7610b84 e2aa39b3

+5 -5
+2 -2
arch/x86/entry/entry_fred.c
··· 78 78 static __always_inline void fred_other(struct pt_regs *regs) 79 79 { 80 80 /* The compiler can fold these conditions into a single test */ 81 - if (likely(regs->fred_ss.vector == FRED_SYSCALL && regs->fred_ss.lm)) { 81 + if (likely(regs->fred_ss.vector == FRED_SYSCALL && regs->fred_ss.l)) { 82 82 regs->orig_ax = regs->ax; 83 83 regs->ax = -ENOSYS; 84 84 do_syscall_64(regs, regs->orig_ax); 85 85 return; 86 86 } else if (ia32_enabled() && 87 - likely(regs->fred_ss.vector == FRED_SYSENTER && !regs->fred_ss.lm)) { 87 + likely(regs->fred_ss.vector == FRED_SYSENTER && !regs->fred_ss.l)) { 88 88 regs->orig_ax = regs->ax; 89 89 regs->ax = -ENOSYS; 90 90 do_fast_syscall_32(regs);
+1 -1
arch/x86/include/asm/fred.h
··· 79 79 .type = type, 80 80 .vector = vector, 81 81 .nmi = type == EVENT_TYPE_NMI, 82 - .lm = 1, 82 + .l = 1, 83 83 }; 84 84 85 85 asm_fred_entry_from_kvm(ss);
+2 -2
arch/x86/include/asm/ptrace.h
··· 84 84 : 4, 85 85 /* Event was incident to enclave execution */ 86 86 enclave : 1, 87 - /* CPU was in long mode */ 88 - lm : 1, 87 + /* CPU was in 64-bit mode */ 88 + l : 1, 89 89 /* 90 90 * Nested exception during FRED delivery, not set 91 91 * for #DF.