diff options
| author | Linus Torvalds | 2012-07-24 04:10:12 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-07-24 04:10:12 +0200 |
| commit | 474183b188b3c5af45831c71151f819fc70479b8 (patch) | |
| tree | 8c82a7d60635fc0d9b0e8d8215e9f2e874f77421 /lib | |
| parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| parent | debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISC (diff) | |
| download | kernel-qcow2-linux-474183b188b3c5af45831c71151f819fc70479b8.tar.gz kernel-qcow2-linux-474183b188b3c5af45831c71151f819fc70479b8.tar.xz kernel-qcow2-linux-474183b188b3c5af45831c71151f819fc70479b8.zip | |
Merge tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc Itanium fixes from Tony Luck.
* tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISC
[IA64] Port OOM changes to ia64_do_page_fault
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index ff5bdee4716d..4a186508bf8b 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -714,7 +714,7 @@ config STACKTRACE config DEBUG_STACK_USAGE bool "Stack utilization instrumentation" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && !IA64 && !PARISC help Enables the display of the minimum amount of free stack which each task has ever had available in the sysrq-T and sysrq-P debug output. |