Removed SM server.

diff --git a/include/minix/com.h b/include/minix/com.h
index 46eaacc2fc1b33075a3fb036076926e2724386b2..545504e25fedfa6ce0512113b548a664ee36ba19 100755 (executable)
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -37,7 +37,6 @@
 #define IS_PROC_NR      5      /* information server */
 #define TTY             6      /* terminal (TTY) driver */
 #define MEMORY          8      /* memory driver (RAM disk, null, etc.) */
-#define SM_PROC_NR      3      /* system management server */
 #define AT_WINI                (MEMORY + ENABLE_AT_WINI)   /* AT Winchester */
 #define FLOPPY         (AT_WINI + ENABLE_FLOPPY)   /* floppy disk */
 #define PRINTER                (FLOPPY + ENABLE_PRINTER)    /* Centronics */
@@ -47,7 +46,7 @@
 
 /* Number of processes contained in the system image. */
 #define IMAGE_SIZE     (NR_TASKS + \
-                       6 + ENABLE_AT_WINI + ENABLE_FLOPPY + \
+                       5 + ENABLE_AT_WINI + ENABLE_FLOPPY + \
                        ENABLE_PRINTER + ENABLE_RTL8139 + ENABLE_FXP + 1 )      
 
 

diff --git a/kernel/table.c b/kernel/table.c
index 3f03c7701fa60ed49b07697857bc6f5d89a28027..dc6e4c96ba468558fe92e23cb7bb33a99c83b559 100755 (executable)
--- a/kernel/table.c
+++ b/kernel/table.c
@@ -67,7 +67,6 @@ PUBLIC struct system_image image[] = {
  { HARDWARE, 0,            0,   TASK_Q, HARDWARE_STACK, EMPTY_CALL_MASK, ALLOW_ALL_MASK,"HARDW." },
  { PM_PROC_NR, 0,            0, 3, 0,          SYSTEM_CALL_MASK,   ALLOW_ALL_MASK,      "PM"      },
  { FS_PROC_NR, 0,            0, 3, 0,          SYSTEM_CALL_MASK,   ALLOW_ALL_MASK,      "FS"      },
- { SM_PROC_NR, 0,            0, 2, 0,           SYSTEM_CALL_MASK,  ALLOW_ALL_MASK,      "SM"      },
  { IS_PROC_NR, 0,            0, 2, 0,           SYSTEM_CALL_MASK,  ALLOW_ALL_MASK,      "IS"      },
  { TTY, 0,            0, 1, 0,            SYSTEM_CALL_MASK, ALLOW_ALL_MASK,      "TTY"      },
  { MEMORY, 0,            0, 2, 0,           SYSTEM_CALL_MASK,  ALLOW_ALL_MASK,     "MEMORY" },

diff --git a/servers/pm/main.c b/servers/pm/main.c
index 90bf4aa6a0d3f422d5874612bbe7fd02c559ae9f..fd40d7697c85cd64469165e84acb9a079c2d006b 100644 (file)
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -213,17 +213,11 @@ PRIVATE void pm_init()
   mproc[INIT_PROC_NR].mp_parent = PM_PROC_NR;
   sigemptyset(&mproc[INIT_PROC_NR].mp_ignore);
   sigemptyset(&mproc[INIT_PROC_NR].mp_sigmask);
-  sigemptyset(&mproc[INIT_PROC_NR].mp_catch);
 
   mproc[PM_PROC_NR].mp_pid = PM_PID;
   mproc[PM_PROC_NR].mp_parent = PM_PARENT;
   sigfillset(&mproc[PM_PROC_NR].mp_ignore);
   sigfillset(&mproc[PM_PROC_NR].mp_sigmask);
-  sigemptyset(&mproc[PM_PROC_NR].mp_catch);
-
-  sigfillset(&mproc[FS_PROC_NR].mp_ignore);
-  sigfillset(&mproc[FS_PROC_NR].mp_sigmask);
-  sigemptyset(&mproc[FS_PROC_NR].mp_catch);
 
   /* Tell FS that no more system processes follow and synchronize. */
   mess.PR_PROC_NR = NONE;

diff --git a/tools/Makefile b/tools/Makefile
index b0f4e837e82bbaff1b932d7136d4d6c0d64c31e3..7c9a7e5cb6b27ad78863b41d110dc2bdd8c83765 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,7 +10,6 @@ MAKE= exec make -$(MAKEFLAGS)
 PROGRAMS=      ../kernel/kernel \
        ../servers/pm/pm \
        ../servers/fs/fs \
-       ../servers/sm/sm \
        ../servers/is/is \
        ../drivers/tty/tty \
        ../drivers/memory/memory \