patch-2.1.26 linux/kernel/time.c

• Lines: 54
• Date: Fri Feb 7 15:54:55 1997
• Orig file: v2.1.25/linux/kernel/time.c
• Orig date: Tue Jan 28 18:50:57 1997

diff -u --recursive --new-file v2.1.25/linux/kernel/time.c linux/kernel/time.c
@@ -66,13 +66,13 @@
 {
 	int i;
 
-	lock_kernel();
+	/* SMP: This is fairly trivial. We grab CURRENT_TIME and 
+	   stuff it to user space. No side effects */
 	i = CURRENT_TIME;
 	if (tloc) {
 		if (put_user(i,tloc))
 			i = -EFAULT;
 	}
-	unlock_kernel();
 	return i;
 }
 
@@ -82,16 +82,20 @@
  * why not move it into the appropriate arch directory (for those
  * architectures that need it).
  */
+ 
 asmlinkage int sys_stime(int * tptr)
 {
-	int value = -EPERM;
+	int value;
 
-	lock_kernel();
 	if (!suser())
-		goto out;
-	value = -EFAULT;
+		return -EPERM;
 	if (get_user(value, tptr))
-		goto out;
+		return -EFAULT;
+	/*
+	 *	SMP: We need to lock out everything for the time update
+	 *	the new cli/sti semantics will let us drop this lock soon.
+	 */
+	lock_kernel();
 	cli();
 	xtime.tv_sec = value;
 	xtime.tv_usec = 0;
@@ -99,10 +103,8 @@
 	time_maxerror = MAXPHASE;
 	time_esterror = MAXPHASE;
 	sti();
-	value = 0;
-out:
 	unlock_kernel();
-	return value;
+	return 0;
 }
 
 #endif