diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 11:53:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 11:53:11 +1000 |
| commit | 8645bb6838fd8303cc5d1b814dc71ad3639491b4 (patch) | |
| tree | c0b006751c487dec19904d417ef747a539cac19f /arch | |
| parent | 16c65aaa1c470b1e9e80d711d21f37c211e73f7a (diff) | |
| parent | 9a31276826122aff21007587b76f5d0fd54d6efa (diff) | |
Merge remote-tracking branch 'kbuild/for-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index f37238f45bcd..5441b14994fc 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -76,7 +76,7 @@ vmlinux.gz: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ unwcheck: vmlinux - -$(Q)READELF=$(READELF) python $(srctree)/arch/ia64/scripts/unwcheck.py $< + -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $< archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d24887b645dc..0550e60e89c6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -537,7 +537,7 @@ config X86_32_IRIS config SCHED_OMIT_FRAME_POINTER def_bool y - prompt "Single-depth WCHAN output" + prompt "Single-depth WCHAN output" if !LTO && !FRAME_POINTER depends on X86 ---help--- Calculate simpler /proc/<PID>/wchan values. If this option |