Merge tag 'stream_open-5.2' of https://lab.nexedi.com/kirr/linux

[sfrench/cifs-2.6.git] / arch / s390 / kernel / nmi.c

diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 8c867b43c8ebc5b60469b52700ad6198daf1d874..0a487fae763eeab927bf5faa65e9ebdcf140e766 100644 (file)
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -125,7 +125,7 @@ void nmi_free_per_cpu(struct lowcore *lc)
 static notrace void s390_handle_damage(void)
 {
        smp_emergency_stop();
-       disabled_wait((unsigned long) __builtin_return_address(0));
+       disabled_wait();
        while (1);
 }
 NOKPROBE_SYMBOL(s390_handle_damage);