From: Erik van der Kouwe <erik@minix3.org>
Date: Wed, 28 Apr 2010 20:37:08 +0000 (+0000)
Subject: Fix wrong word
X-Git-Tag: v3.1.7~102
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=93f3bf5bda333140d370c6afe4681da2603d9867;p=minix.git

Fix wrong word
---

diff --git a/servers/pm/main.c b/servers/pm/main.c
index 41d3c4106..31e7b14ee 100644
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -65,7 +65,7 @@ PUBLIC int main()
 
   /* SEF local startup. */
   sef_local_startup();
-  overtake_scheduling();	/* overtake all running processes */
+  takeover_scheduling();	/* takeover all running processes */
 
   /* This is PM's main loop-  get work and do it, forever and forever. */
   while (TRUE) {
diff --git a/servers/pm/proto.h b/servers/pm/proto.h
index fd31529a2..501f24fe5 100644
--- a/servers/pm/proto.h
+++ b/servers/pm/proto.h
@@ -63,7 +63,7 @@ _PROTOTYPE( int do_getsetpriority, (void)				);
 /* schedule.c */
 _PROTOTYPE( int schedule_process, (struct mproc * rmp)			);
 _PROTOTYPE( void do_noquantum, (void)					);
-_PROTOTYPE( void overtake_scheduling, (void)				);
+_PROTOTYPE( void takeover_scheduling, (void)				);
 _PROTOTYPE( void balance_queues, (struct timer *tp)			);
 
 /* profile.c */
diff --git a/servers/pm/schedule.c b/servers/pm/schedule.c
index 2f6ee3d24..6378eb565 100644
--- a/servers/pm/schedule.c
+++ b/servers/pm/schedule.c
@@ -52,9 +52,9 @@ PUBLIC void do_noquantum(void)
 }
 
 /*===========================================================================*
- *				overtake_scheduling			     *
+ *				takeover_scheduling			     *
  *===========================================================================*/
-PUBLIC void overtake_scheduling(void)
+PUBLIC void takeover_scheduling(void)
 {
 	struct mproc *trmp;
 	int proc_nr;
@@ -62,12 +62,12 @@ PUBLIC void overtake_scheduling(void)
 	tmr_inittimer(&sched_timer);
 
 	for (proc_nr=0, trmp=mproc; proc_nr < NR_PROCS; proc_nr++, trmp++) {
-		/* Don't overtake system processes. When the system starts,
-		 * this will typically only overtake init, from which other
+		/* Don't takeover system processes. When the system starts,
+		 * this will typically only takeover init, from which other
 		 * user space processes will inherit. */
 		if (trmp->mp_flags & IN_USE && !(trmp->mp_flags & PRIV_PROC)) {
 			if (sys_schedctl(trmp->mp_endpoint))
-				printf("PM: Error while overtaking scheduling for %s\n",
+				printf("PM: Error while taking over scheduling for %s\n",
 					trmp->mp_name);
 			trmp->mp_flags |= PM_SCHEDULED;
 		}