Skip to content

Commit

Permalink
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history 
…nux/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
  • Loading branch information
Linus Torvalds committed Sep 1, 2015
2 parents 11e612d + 16eefbd commit a0c0d98
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/x86/configs/i386_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/x86/configs/x86_64_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a0c0d98

Please sign in to comment.