---

yaml --- r: 85903 b: refs/heads/master c: 06cb92f h: refs/heads/master i: 85901: 434e907 85899: fcddab5 85895: 7a0efd6 85887: 7b88cee v: v3
git-mirror · Feb 19, 2008 · 50cbc44 · 50cbc44
1 parent 70fb840
commit 50cbc44
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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