2 files changed, 7 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 053cac19f714..52e95c2158c0 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -638,18 +638,18 @@ void rtas_halt(void)
 /* Must be in the RMO region, so we place it here */
 static char rtas_os_term_buf[2048];
 
-void rtas_panic_msg(char *str)
-{
-        snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
-}
-
-void rtas_os_term(void)
+void rtas_os_term(char *str)
 {
         int status;
 
+        if (panic_timeout)
+                return;
+
         if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))
                 return;
 
+        snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
+
         do {
                 status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
                                    __pa(rtas_os_term_buf));
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index fdeefe54ea91..fdb9b1c8f977 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -507,8 +507,7 @@ define_machine(pseries) {
         .restart                = rtas_restart,
         .power_off              = pSeries_power_off,
         .halt                   = rtas_halt,
-        .panic                  = rtas_panic_msg,
-        .machine_shutdown       = rtas_os_term,
+        .panic                  = rtas_os_term,
         .get_boot_time          = rtas_get_boot_time,
         .get_rtc_time           = rtas_get_rtc_time,
         .set_rtc_time           = rtas_set_rtc_time,