From: Jorrit Herder <jnherder@minix3.org>
Date: Tue, 23 Aug 2005 11:28:16 +0000 (+0000)
Subject: Renamed SM to RS (Reincarnation Server).
X-Git-Tag: v3.1.0~303
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/verify-sign/verify.pl?a=commitdiff_plain;h=10e4e9894708a2b8b3ff13996ad405c0b660d352;p=minix.git

Renamed SM to RS (Reincarnation Server).
---

diff --git a/include/minix/com.h b/include/minix/com.h
index ccc8a8613..9bd5701ca 100755
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -33,7 +33,7 @@
 /* User-space processes, that is, device drivers, servers, and INIT. */
 #define PM_PROC_NR	 0	/* process manager */
 #define FS_PROC_NR 	 1	/* file system */
-#define SM_PROC_NR 	 2	/* system service manager */
+#define RS_PROC_NR 	 2	/* reincarnation server */
 #define MEM_PROC_NR 	 3  	/* memory driver (RAM disk, null, etc.) */
 #define LOG_PROC_NR	 4	/* log device driver */
 #define TTY_PROC_NR	 5	/* terminal (TTY) driver */
diff --git a/kernel/table.c b/kernel/table.c
index 57cbeb767..16b88bfa5 100755
--- a/kernel/table.c
+++ b/kernel/table.c
@@ -68,7 +68,7 @@ PUBLIC char *t_stack[TOT_STACK_SPACE / sizeof(char *)];
 #define s(n)		(1 << s_nr_to_id(n))
 #define SRV_M	(~0)
 #define SYS_M	(~0)
-#define USR_M	(s(PM_PROC_NR) | s(FS_PROC_NR) | s(SM_PROC_NR))
+#define USR_M	(s(PM_PROC_NR) | s(FS_PROC_NR) | s(RS_PROC_NR))
 #define DRV_M	(USR_M | s(SYSTEM) | s(CLOCK) | s(LOG_PROC_NR) | s(TTY_PROC_NR))
 
 /* Define kernel calls that processes are allowed to make. This is not looking
@@ -77,7 +77,7 @@ PUBLIC char *t_stack[TOT_STACK_SPACE / sizeof(char *)];
  * be allowed to distribute rights to services that it starts. 
  */
 #define c(n)	(1 << ((n)-KERNEL_CALL))
-#define SM_C	~0	
+#define RS_C	~0	
 #define PM_C	~(c(SYS_DEVIO) | c(SYS_SDEVIO) | c(SYS_VDEVIO) \
     | c(SYS_IRQCTL) | c(SYS_INT86))
 #define FS_C	(c(SYS_KILL) | c(SYS_VIRCOPY) | c(SYS_VIRVCOPY) | c(SYS_UMAP) \
@@ -101,7 +101,7 @@ PUBLIC struct boot_image image[] = {
  { HARDWARE,      0, TSK_F, 64, TASK_Q, HRD_S,     0,     0,     0, "KERNEL"},
  { PM_PROC_NR,    0, SRV_F, 32,      3, 0,     SRV_T, SRV_M,  PM_C, "pm"    },
  { FS_PROC_NR,    0, SRV_F, 32,      4, 0,     SRV_T, SRV_M,  FS_C, "fs"    },
- { SM_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  SM_C, "sm"    },
+ { RS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  RS_C, "rs"    },
  { TTY_PROC_NR,   0, SRV_F,  4,      1, 0,     SRV_T, SYS_M, DRV_C, "tty"   },
  { MEM_PROC_NR,   0, SRV_F,  4,      2, 0,     SRV_T, DRV_M, MEM_C, "memory"},
  { LOG_PROC_NR,   0, SRV_F,  4,      2, 0,     SRV_T, SYS_M, DRV_C, "log"   },
diff --git a/tools/Makefile b/tools/Makefile
index 1d484790a..5b1ecd99c 100755
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,7 +13,7 @@ MAKE=	exec make -$(MAKEFLAGS)
 PROGRAMS=	../kernel/kernel \
 	../servers/pm/pm \
 	../servers/fs/fs \
-	../servers/sm/sm \
+	../servers/rs/rs \
 	../drivers/tty/tty \
 	../drivers/memory/memory \
 	../drivers/log/log \