aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/pseries/setup.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 11:09:21 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 11:09:21 +1100
commit43ca5d347acc0dcae988dbd38b5bb5a930744a75 (patch)
tree63dd3f2def7220aa0df7951553bbd18022ccb96b /arch/powerpc/platforms/pseries/setup.c
parentefdad722ef4d69eaaa8335deab0b6f55f52d7e57 (diff)
parent2440c01e10f07adcbc2094ba12ae4ad6094bd2b6 (diff)
downloadlinaro-lsk-43ca5d347acc0dcae988dbd38b5bb5a930744a75.tar.gz
Merge branch 'kexec' into next
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r--arch/powerpc/platforms/pseries/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 164839cb9fc..f79f1278dfc 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -366,6 +366,8 @@ static void pSeries_idle(void)
static void __init pSeries_setup_arch(void)
{
+ panic_timeout = 10;
+
/* Discover PIC type and setup ppc_md accordingly */
pseries_discover_pic();