提交 ac1a14a2 编写于 作者: L Linus Torvalds

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
...@@ -255,6 +255,7 @@ static void init_cyrix(struct cpuinfo_x86 *c) ...@@ -255,6 +255,7 @@ static void init_cyrix(struct cpuinfo_x86 *c)
break; break;
case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */ case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
case 11: /* GX1 with inverted Device ID */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
{ {
u32 vendor, device; u32 vendor, device;
......
...@@ -619,6 +619,9 @@ int __init save_microcode_in_initrd_intel(void) ...@@ -619,6 +619,9 @@ int __init save_microcode_in_initrd_intel(void)
show_saved_mc(); show_saved_mc();
/* initrd is going away, clear patch ptr. */
intel_ucode_patch = NULL;
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册