Merge tag 's390-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-block.git] / arch / s390 / kernel / setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 0903fe35663410fb01760b494e4e7f67452b959f..fe10da1a271e867966c2635e0ae1c4f5280a8f8f 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -381,7 +381,7 @@ void stack_free(unsigned long stack)
 #endif
 }
 
-void __init arch_call_rest_init(void)
+void __init __noreturn arch_call_rest_init(void)
 {
        smp_reinit_ipl_cpu();
        rest_init();