Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / arch / powerpc / platforms / powernv / setup.c

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 8c16a5f9672809fbbbc3bdfb934459f9d3d2ebb8..d9b88fa7c5a349f26c040b20dcf5e72a67de8860 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -35,11 +35,14 @@
 #include <asm/rtas.h>
 #include <asm/opal.h>
 #include <asm/kexec.h>
+#include <asm/smp.h>
 
 #include "powernv.h"
 
 static void __init pnv_setup_arch(void)
 {
+       set_arch_panic_timeout(10, ARCH_PANIC_TIMEOUT);
+
        /* Initialize SMP */
        pnv_smp_init();