Skip to content

Commit ac1a14a

Browse files
committed
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Misc fixes: a Geode fix plus a microcode loader fix" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/microcode/intel: Clear patch pointer before jettisoning the initrd x86/cpu/cyrix: Add alternative Device ID of Geode GX1 SoC
2 parents 45b44f0 + 5b0bc9a commit ac1a14a

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/x86/kernel/cpu/cyrix.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ static void init_cyrix(struct cpuinfo_x86 *c)
255255
break;
256256

257257
case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
258+
case 11: /* GX1 with inverted Device ID */
258259
#ifdef CONFIG_PCI
259260
{
260261
u32 vendor, device;

arch/x86/kernel/cpu/microcode/intel.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,9 @@ int __init save_microcode_in_initrd_intel(void)
619619

620620
show_saved_mc();
621621

622+
/* initrd is going away, clear patch ptr. */
623+
intel_ucode_patch = NULL;
624+
622625
return 0;
623626
}
624627

0 commit comments

Comments
 (0)