From: David van Moolenbroek <david@minix3.org>
Date: Sat, 28 Nov 2009 13:22:01 +0000 (+0000)
Subject: PM: remove 'boottime' global variable
X-Git-Tag: v3.1.6~188
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/openssl_button.gif?a=commitdiff_plain;h=45123f83d38d663befcaefa6014f48a4ecb3ebaa;p=minix.git

PM: remove 'boottime' global variable
---

diff --git a/servers/pm/glo.h b/servers/pm/glo.h
index 35ca458b8..9bafc6533 100644
--- a/servers/pm/glo.h
+++ b/servers/pm/glo.h
@@ -22,9 +22,6 @@ extern _PROTOTYPE (int (*call_vec[]), (void) );	/* system call handlers */
 EXTERN sigset_t core_sset;	/* which signals cause core images */
 EXTERN sigset_t ign_sset;	/* which signals are by default ignored */
 
-EXTERN time_t boottime;		/* time when the system was booted (for
-				 * reporting to FS)
-				 */
 EXTERN u32_t system_hz;		/* System clock frequency. */
 EXTERN int abort_flag;
 EXTERN char monitor_code[256];		
diff --git a/servers/pm/time.c b/servers/pm/time.c
index 2bbb28406..9c5497aae 100644
--- a/servers/pm/time.c
+++ b/servers/pm/time.c
@@ -23,10 +23,10 @@ PUBLIC int do_time()
  * rotates at a constant rate and that such things as leap seconds do not 
  * exist.
  */
-  clock_t uptime;
+  clock_t uptime, boottime;
   int s;
 
-  if ( (s=getuptime(&uptime)) != OK) 
+  if ( (s=getuptime2(&uptime, &boottime)) != OK) 
   	panic(__FILE__,"do_time couldn't get uptime", s);
 
   mp->mp_reply.reply_time = (time_t) (boottime + (uptime/system_hz));
@@ -40,10 +40,9 @@ PUBLIC int do_time()
 PUBLIC int do_stime()
 {
 /* Perform the stime(tp) system call. Retrieve the system's uptime (ticks 
- * since boot) and store the time in seconds at system boot in the global
- * variable 'boottime'.
+ * since boot) and pass the new time in seconds at system boot to the kernel.
  */
-  clock_t uptime;
+  clock_t uptime, boottime;
   int s;
 
   if (mp->mp_effuid != SUPER_USER) { 
diff --git a/servers/rs/service.c b/servers/rs/service.c
index 4f2f0a3eb..2e7872007 100644
--- a/servers/rs/service.c
+++ b/servers/rs/service.c
@@ -689,6 +689,7 @@ struct
 	{ "UMAP",		SYS_UMAP },
 	{ "VIRCOPY",		SYS_VIRCOPY },
 	{ "IRQCTL",		SYS_IRQCTL },
+	{ "INT86",		SYS_INT86 },
 	{ "DEVIO",		SYS_DEVIO },
 	{ "SDEVIO",		SYS_SDEVIO },
 	{ "VDEVIO",		SYS_VDEVIO },
@@ -700,11 +701,11 @@ struct
 	{ "VSAFECOPY",		SYS_VSAFECOPY },
 	{ "SETGRANT",		SYS_SETGRANT },
 	{ "READBIOS",		SYS_READBIOS },
+	{ "PROFBUF",		SYS_PROFBUF },
+	{ "STIME",		SYS_STIME },
 	{ "MAPDMA",		SYS_MAPDMA },
 	{ "VMCTL",		SYS_VMCTL },
-	{ "PROFBUF",		SYS_PROFBUF },
 	{ "SYSCTL",		SYS_SYSCTL },
-	{ "INT86",		SYS_INT86 },
 	{ NULL,		0 }
 };