Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac1a14a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 45b44f0f 5b0bc9ac

arch/x86/kernel/cpu/cyrix.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

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

+3 −0
Original line number Diff line number Diff line
@@ -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;

}