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

Commit a0c0d985 authored Sep 01, 2015 by Linus Torvalds

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

Pull x86 build fixlet from Ingo Molnar:
 "A single change propagating CONFIG_JUMP_LABEL into the x86 defconfigs"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kconfig: Enable CONFIG_JUMP_LABEL in the defconfigs

parents 11e612dd 16eefbd1

arch/x86/configs/i386_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ CONFIG_BLK_DEV_INITRD=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_PROFILING=y
		CONFIG_KPROBES=y
		CONFIG_JUMP_LABEL=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_MODULE_FORCE_UNLOAD=y

arch/x86/configs/x86_64_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ CONFIG_BLK_DEV_INITRD=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_PROFILING=y
		CONFIG_KPROBES=y
		CONFIG_JUMP_LABEL=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_MODULE_FORCE_UNLOAD=y