summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-04-30 23:20:04 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-06-11 09:04:07 +0200
commit4817fc323dad9f08f2cb1aca22e6dc7f894c95d5 (patch)
tree00e0d48a5e3d1921d2ddf17591161a46940e653e /arch
parentpowerpc/xmon: avoid format string leaking to printk (diff)
downloadlinux-4817fc323dad9f08f2cb1aca22e6dc7f894c95d5.tar.xz
linux-4817fc323dad9f08f2cb1aca22e6dc7f894c95d5.zip
powerpc/powernv: Reduce panic timeout from 180s to 10s
We've already dropped the default pseries timeout to 10s, do the same for powernv. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/powernv/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 678573c4ac49..d9b88fa7c5a3 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -41,6 +41,8 @@
static void __init pnv_setup_arch(void)
{
+ set_arch_panic_timeout(10, ARCH_PANIC_TIMEOUT);
+
/* Initialize SMP */
pnv_smp_init();