diff options
author | Linus Torvalds | 2015-04-13 13:19:59 -0700 |
---|---|---|
committer | Linus Torvalds | 2015-04-13 13:19:59 -0700 |
commit | 5945fba8c596546a075382c42cf35141d1ae6eca (patch) | |
tree | 81bf2d12cd361401244a43d3468317dda00ed574 /arch/x86/kernel | |
parent | 8f74bc5ff0eb20a055e4cb8d390669164ca15cb3 (diff) | |
parent | d8eb8940417559808fdd0180a4d50f8f0281b822 (diff) |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build changes from Ingo Molnar:
"Small cleanups and fixes"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text
x86/build/defconfig: Enable USB_EHCI_TT_NEWSCHED=y
x86/build: Fix mkcapflags.sh bash-ism
x86/Kconfig: Simplify X86_UP_APIC handling
x86/Kconfig: Simplify X86_IO_APIC dependencies
x86/Kconfig: Avoid issuing pointless turned off entries to .config
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/mkcapflags.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mkcapflags.sh b/arch/x86/kernel/cpu/mkcapflags.sh index 36d99a337b49..3f20710a5b23 100644 --- a/arch/x86/kernel/cpu/mkcapflags.sh +++ b/arch/x86/kernel/cpu/mkcapflags.sh @@ -6,7 +6,7 @@ IN=$1 OUT=$2 -function dump_array() +dump_array() { ARRAY=$1 SIZE=$2 |