From 50cbc4459613273865254d91b455c1fd274a8adc Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 19 Feb 2008 15:29:31 +0100
Subject: [PATCH] --- yaml --- r: 85903 b: refs/heads/master c:
 06cb92ffe418c4a9d5a70c5dff4f283e8e8df6e4 h: refs/heads/master i:   85901:
 434e907618ebed40175e29acb58fcf27d34f6794   85899:
 fcddab5c4a43d412dd069da32d7bcebf3f11543f   85895:
 7a0efd611be808dfb8c40fd2ec0e7ce53b682658   85887:
 7b88ceeae015a9f1160ef2f52b89053a3c405dd0 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/s390/kernel/time.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b860210ece7..3f65ce469cae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b32ecdb7257821e5e42d9b9b2a427b02c89f85e7
+refs/heads/master: 06cb92ffe418c4a9d5a70c5dff4f283e8e8df6e4
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
index 3bbac1293be4..76a5dd1b4ce9 100644
--- a/trunk/arch/s390/kernel/time.c
+++ b/trunk/arch/s390/kernel/time.c
@@ -744,7 +744,6 @@ static void etr_adjust_time(unsigned long long clock, unsigned long long delay)
 	}
 }
 
-#ifdef CONFIG_SMP
 static void etr_sync_cpu_start(void *dummy)
 {
 	int *in_sync = dummy;
@@ -777,7 +776,6 @@ static void etr_sync_cpu_start(void *dummy)
 static void etr_sync_cpu_end(void *dummy)
 {
 }
-#endif /* CONFIG_SMP */
 
 /*
  * Sync the TOD clock using the port refered to by aibp. This port