Skip to content

Commit 94749f5

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into rpi-6.12.y
2 parents c4d7426 + 259f497 commit 94749f5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 37
4+
SUBLEVEL = 38
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ static bool amd_check_tsa_microcode(void)
376376

377377
p.ext_fam = c->x86 - 0xf;
378378
p.model = c->x86_model;
379+
p.ext_model = c->x86_model >> 4;
379380
p.stepping = c->x86_stepping;
380381

381382
if (cpu_has(c, X86_FEATURE_ZEN3) ||

0 commit comments

Comments
 (0)