Merge tag 'batadv-net-for-davem-20190509' of git://git.open-mesh.org/linux-merge

[linux-2.6-microblaze.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 0ae0d73..c1fcaad 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -318,12 +318,7 @@ void panic(const char *fmt, ...)
        }
 #endif
 #if defined(CONFIG_S390)
-       {
-               unsigned long caller;
-
-               caller = (unsigned long)__builtin_return_address(0);
-               disabled_wait(caller);
-       }
+       disabled_wait();
 #endif
        pr_emerg("---[ end Kernel panic - not syncing: %s ]---\n", buf);
        local_irq_enable();