aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/pseries/setup.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-11-29 19:23:14 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-07 22:02:23 -0500
commita934904d8ac2411ca329fc50daa29ab35a8f198b (patch)
treedc87076a1aa6fcc04bd631623e76347a52cf4970 /arch/powerpc/platforms/pseries/setup.c
parent760ca4dc90e624eb8f7ff85a5925151e25577758 (diff)
powerpc: Reduce pseries panic timeout from 180s to 10s
We've had a 180 second panic timeout on ppc64 for as long as I can remember. This patch reduces it to 10 seconds on pseries for a few reasons: - Almost all pseries machines have a hypervisor console so panic output will be available in a scrollback buffer. - The 180 seconds impacts our availability, users (other than kernel hackers) just want the box to come back around so it can continue its work. - I spend a lot of my life staring at the 180 second panic timeout. Many pseries machines take minutes to power cycle, so it's quicker to sit through the 180 seconds than it is to power cycle. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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 01df08dbc43c..992d797e07da 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -353,6 +353,8 @@ early_initcall(alloc_dispatch_log_kmem_cache);
353 353
354static void __init pSeries_setup_arch(void) 354static void __init pSeries_setup_arch(void)
355{ 355{
356 panic_timeout = 10;
357
356 /* Discover PIC type and setup ppc_md accordingly */ 358 /* Discover PIC type and setup ppc_md accordingly */
357 pseries_discover_pic(); 359 pseries_discover_pic();
358 360