diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-10 10:51:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-10 10:51:25 -0700 |
| commit | ac1a14a239bb1a871dbd20daea4946aa5d289a1d (patch) | |
| tree | 2d40b783f9fd85f9f2e363830cac3b7501ea583b /arch | |
| parent | 45b44f0f287d6d396b78466e13be1d1ea3d3097b (diff) | |
| parent | 5b0bc9ac2ce4881ee318a21f31140584ce4dbdad (diff) | |
| download | linux-ac1a14a239bb1a871dbd20daea4946aa5d289a1d.tar.bz2 | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/cyrix.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c index a70fd61095f8..6f077445647a 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c @@ -255,6 +255,7 @@ static void init_cyrix(struct cpuinfo_x86 *c) break; case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */ + case 11: /* GX1 with inverted Device ID */ #ifdef CONFIG_PCI { u32 vendor, device; diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index afdfd237b59f..f522415bf9e5 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -619,6 +619,9 @@ int __init save_microcode_in_initrd_intel(void) show_saved_mc(); + /* initrd is going away, clear patch ptr. */ + intel_ucode_patch = NULL; + return 0; } |