[PATCH v4 2/3] s390: Implement arch_do_panic()

Implement s390 specific arch_do_panic() instead of using s390 specific
ifdef sections in vpanic() code.
No functional changes.

Signed-off-by: Mete Durlu <[email protected]>
---
 arch/s390/kernel/ipl.c | 6 ++++++
 kernel/panic.c         | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 3c346b02ceb9..31ff7c12c354 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -13,6 +13,7 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/kstrtox.h>
+#include <linux/panic.h>
 #include <linux/panic_notifier.h>
 #include <linux/reboot.h>
 #include <linux/ctype.h>
@@ -2343,6 +2344,11 @@ static struct notifier_block on_panic_nb = {
 	.priority = INT_MIN,
 };
 
+void arch_do_panic(void)
+{
+	disabled_wait();
+}
+
 void __init setup_ipl(void)
 {
 	BUILD_BUG_ON(sizeof(struct ipl_parameter_block) != PAGE_SIZE);
diff --git a/kernel/panic.c b/kernel/panic.c
index 726a97842232..ee6e3f9e3900 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -752,9 +752,6 @@ void vpanic(const char *fmt, va_list args)
 		pr_emerg("Press Stop-A (L1-A) from sun keyboard or send break\n"
 			 "twice on console to return to the boot prom\n");
 	}
-#endif
-#if defined(CONFIG_S390)
-	disabled_wait();
 #endif
 	pr_emerg("---[ end Kernel panic - not syncing: %s ]---\n", buf);
 

-- 
2.55.0