s390/smp: fix do_restart() prototype

Funciton do_restart() is a callback invoked from the
restart CPU routine and passed a single parameter.

Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index 09abb11bc6602f33ea258cfa023c4a991173d8ef..1ab33465382ff7ecae40b42adeb7a17d4a57a402 100644 (file)
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -36,7 +36,7 @@ void do_notify_resume(struct pt_regs *regs);
 void __init init_IRQ(void);
 void do_io_irq(struct pt_regs *regs);
 void do_ext_irq(struct pt_regs *regs);
-void do_restart(void);
+void do_restart(void *arg);
 void __init startup_init(void);
 void die(struct pt_regs *regs, const char *str);
 int setup_profiling_timer(unsigned int multiplier);

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 7a21eca498aae762ee26be052078689639325b49..dba04fbc37a210b4a412281c6074fcac13398e28 100644 (file)
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -1849,12 +1849,12 @@ static void __do_restart(void *ignore)
        stop_run(&on_restart_trigger);
 }
 
-void do_restart(void)
+void do_restart(void *arg)
 {
        tracing_off();
        debug_locks_off();
        lgr_info_log();
-       smp_call_online_cpu(__do_restart, NULL);
+       smp_call_online_cpu(__do_restart, arg);
 }
 
 /* on halt */