---

yaml --- r: 297380 b: refs/heads/master c: a4ca129 h: refs/heads/master v: v3
git-mirror · Mar 16, 2012 · 73ed472 · 73ed472
1 parent a93039e
commit 73ed472
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f695cf94837de53864180400cbac42cfa370426f
+refs/heads/master: a4ca1298d8a0472a45624fa5fb99f90f0f367187
diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c
@@ -163,7 +163,6 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
 		return error;
 
 	if (tz) {
-		/* SMP safe, global irq locking makes it work. */
 		sys_tz = *tz;
 		update_vsyscall_tz();
 		if (firsttime) {
@@ -173,12 +172,7 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
 		}
 	}
 	if (tv)
-	{
-		/* SMP safe, again the code in arch/foo/time.c should
-		 * globally block out interrupts when it runs.
-		 */
 		return do_settimeofday(tv);
-	}
 	return 0;
 }