From 790824dc8ad40083fab3bf614a975488e2de2886 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 23 May 2011 10:24:33 +0200
Subject: [PATCH] --- yaml --- r: 250540 b: refs/heads/master c:
 b456d94a9757db54eca4677c1b3a13e7170c9bb3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/kernel/smp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ac297b2106e..49600385d81b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c2241fd42298007d7c3a92318806a4a9490a93c
+refs/heads/master: b456d94a9757db54eca4677c1b3a13e7170c9bb3
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index 63c7d9ff220d..2310f07aaadb 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -681,7 +681,7 @@ void __cpu_die(unsigned int cpu)
 	atomic_dec(&init_mm.context.attach_count);
 }
 
-void cpu_die(void)
+void __noreturn cpu_die(void)
 {
 	idle_task_exit();
 	while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)