diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 22:10:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 22:10:12 -0400 |
| commit | 474183b188b3c5af45831c71151f819fc70479b8 (patch) | |
| tree | 8c82a7d60635fc0d9b0e8d8215e9f2e874f77421 /lib | |
| parent | 47b170af84d18b736bb35932823ec01cfcfe1967 (diff) | |
| parent | e9c31b32f1cc6d3aa190119103622fb8e4c257b1 (diff) | |
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 | |||
| 714 | 714 | ||
| 715 | config DEBUG_STACK_USAGE | 715 | config DEBUG_STACK_USAGE |
| 716 | bool "Stack utilization instrumentation" | 716 | bool "Stack utilization instrumentation" |
| 717 | depends on DEBUG_KERNEL | 717 | depends on DEBUG_KERNEL && !IA64 && !PARISC |
| 718 | help | 718 | help |
| 719 | Enables the display of the minimum amount of free stack which each | 719 | Enables the display of the minimum amount of free stack which each |
| 720 | task has ever had available in the sysrq-T and sysrq-P debug output. | 720 | task has ever had available in the sysrq-T and sysrq-P debug output. |