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

Commit beb5af40 authored Dec 05, 2014 by Linus Torvalds

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

parents 32f0880b 02ecc41a

arch/x86/boot/compressed/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ suffix-$(CONFIG_KERNEL_XZ) := xz
		suffix-$(CONFIG_KERNEL_LZO) := lzo
		suffix-$(CONFIG_KERNEL_LZ4) := lz4

		RUN_SIZE = $(shell objdump -h vmlinux \| \
		RUN_SIZE = $(shell $(OBJDUMP) -h vmlinux \| \
		perl $(srctree)/arch/x86/tools/calc_run_size.pl)
		quiet_cmd_mkpiggy = MKPIGGY $@
		cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ \|\| ( rm -f $@ ; false )

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -465,6 +465,7 @@ static void mc_bp_resume(void)

		if (uci->valid && uci->mc)
		microcode_ops->apply_microcode(cpu);
		#ifdef CONFIG_X86_64
		else if (!uci->mc)
		/*
		* We might resume and not have applied late microcode but still
		@@ -473,6 +474,7 @@ static void mc_bp_resume(void)
		* applying patches early on the APs.
		*/
		load_ucode_ap();
		#endif
		}

		static struct syscore_ops mc_syscore_ops = {