Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
"Two final fixlets for 3.18:
- Prevent microcode reload wreckage on 32bit
- Unbreak cross compilation"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Limit the microcode reloading to 64-bit for now
x86: Use $(OBJDUMP) instead of plain objdump

Changed files
+3 -1
arch
x86
boot
compressed
kernel
cpu
microcode
+1 -1
arch/x86/boot/compressed/Makefile
··· 76 76 suffix-$(CONFIG_KERNEL_LZO) := lzo 77 77 suffix-$(CONFIG_KERNEL_LZ4) := lz4 78 78 79 - RUN_SIZE = $(shell objdump -h vmlinux | \ 79 + RUN_SIZE = $(shell $(OBJDUMP) -h vmlinux | \ 80 80 perl $(srctree)/arch/x86/tools/calc_run_size.pl) 81 81 quiet_cmd_mkpiggy = MKPIGGY $@ 82 82 cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ || ( rm -f $@ ; false )
+2
arch/x86/kernel/cpu/microcode/core.c
··· 465 465 466 466 if (uci->valid && uci->mc) 467 467 microcode_ops->apply_microcode(cpu); 468 + #ifdef CONFIG_X86_64 468 469 else if (!uci->mc) 469 470 /* 470 471 * We might resume and not have applied late microcode but still ··· 474 473 * applying patches early on the APs. 475 474 */ 476 475 load_ucode_ap(); 476 + #endif 477 477 } 478 478 479 479 static struct syscore_ops mc_syscore_ops = {