[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel time.c,1.6,1.7

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv17201/kernel

Modified Files:
	time.c 
Log Message:
save_and_cli() and friends are gone away in 2.5.28


Index: time.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/time.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- time.c	27 Jan 2003 00:21:36 -0000	1.6
+++ time.c	9 Feb 2003 01:32:36 -0000	1.7
@@ -210,12 +210,12 @@
 {
 	unsigned long flags;
 
-	save_and_cli(flags);
+	read_lock_irqsave(&xtime_lock, flags);
 
 	*tv = xtime;
 	tv->tv_usec += do_gettimeoffset();
 
-	restore_flags(flags);
+	spin_unlock_irqrestore(&xtime_lock, flags);
 
 	if (tv->tv_usec >= 1000000) {
 		tv->tv_usec -= 1000000;
@@ -227,7 +227,7 @@
 {
 	unsigned long flags;
 
-	save_and_cli(flags);
+	write_lock_irqsave(&xtime_lock, flags);
 	/* This is revolting. We need to set the xtime.tv_usec
 	 * correctly. However, the value in this location is
 	 * is value at the last tick.
@@ -248,7 +248,7 @@
 	time_esterror = NTP_PHASE_LIMIT;
 	xtime = *tv;
 
-	restore_flags(flags);
+	spin_unlock_irqrestore(&xtime_lock, flags);
 }
 
 /* nicked from the i386 port, but we use the same chip, hee hee */