diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-13 08:47:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-13 08:47:22 +0200 |
| commit | 3f365cf304ba3d316b3df2474af8d7df6edd2455 (patch) | |
| tree | bb52465b35606bec268e9c1b88c746f8caf0f919 /arch/x86 | |
| parent | bbf79d21bd4627a01ca8721c9373752819f8e4cc (diff) | |
| parent | 252d2a4117bc181b287eeddf848863788da733ae (diff) | |
| download | linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.tar.bz2 | |
Merge branch 'sched/urgent' into x86/mm, to pick up dependent fix
Andy will need the following scheduler fix for the PCID series:
252d2a4117bc: sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
So do a cross-merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -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; } |