Commit 47e9aa14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 338c8473 f545e883

arch/x86/include/asm/intel-family.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ 
#define INTEL_FAM6_METEORLAKE		0xAC

#define INTEL_FAM6_METEORLAKE_L		0xAA



#define INTEL_FAM6_LUNARLAKE_M		0xBD



/* "Small Core" Processors (Atom/E-Core) */



#define INTEL_FAM6_ATOM_BONNELL		0x1C /* Diamondville, Pineview */

arch/x86/kernel/kprobes/core.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int prepare_emulation(struct kprobe *p, struct insn *insn) 
		/* 1 byte conditional jump */

		p->ainsn.emulate_op = kprobe_emulate_jcc;

		p->ainsn.jcc.type = opcode & 0xf;

		p->ainsn.rel32 = *(char *)insn->immediate.bytes;

		p->ainsn.rel32 = insn->immediate.value;

		break;

	case 0x0f:

		opcode = insn->opcode.bytes[1];