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-urgent-2023-02-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
"Fix a kprobes bug, plus add a new Intel model number to the upstream
<asm/intel-family.h> header for drivers to use"

* tag 'x86-urgent-2023-02-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu: Add Lunar Lake M
x86/kprobes: Fix 1 byte conditional jump target

Linus Torvalds 47e9aa14 338c8473

+3 -1
+2
arch/x86/include/asm/intel-family.h
··· 123 123 #define INTEL_FAM6_METEORLAKE 0xAC 124 124 #define INTEL_FAM6_METEORLAKE_L 0xAA 125 125 126 + #define INTEL_FAM6_LUNARLAKE_M 0xBD 127 + 126 128 /* "Small Core" Processors (Atom/E-Core) */ 127 129 128 130 #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */
+1 -1
arch/x86/kernel/kprobes/core.c
··· 625 625 /* 1 byte conditional jump */ 626 626 p->ainsn.emulate_op = kprobe_emulate_jcc; 627 627 p->ainsn.jcc.type = opcode & 0xf; 628 - p->ainsn.rel32 = *(char *)insn->immediate.bytes; 628 + p->ainsn.rel32 = insn->immediate.value; 629 629 break; 630 630 case 0x0f: 631 631 opcode = insn->opcode.bytes[1];