diff --git a/[refs] b/[refs]
index 365a948bef20..489897505019 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f28fa729149c8b39699f7995ce5fff34c5145a9d
+refs/heads/master: e9c31b32f1cc6d3aa190119103622fb8e4c257b1
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index a42d3ae39648..5d3e3288438f 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -694,7 +694,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.