Update sys_createmodule and sys_initmodule

diff --git a/ChangeLog b/ChangeLog
index a0ce0785230d384d2b7c747002dbb651e7056ac8..9748677c3c3ef9a22f24a4b50dfee07cffa59640 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 15 23:00:32 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from Maciej W. Rozycki <macro@ds2.pg.gda.pl>:
+    + Correctly implement fix sys_createmodule (Linux)
+    + Add limited handlig of sys_initmodule (Linux)
+
 Tue Jul 13 17:07:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Add configure-test for sys/reg.h and use that

diff --git a/linux/dummy.h b/linux/dummy.h
index cdf65b65ee13472e16ad3878198222c22ef5703a..ba9c4b60f0caceb72a3a4295591de33b24dac4eb 100644 (file)
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -35,7 +35,6 @@
 #define        sys_iopl                printargs
 #define        sys_vm86old             printargs
 #define        sys_modify_ldt          printargs
-#define        sys_init_module         printargs
 #define        sys_get_kernel_syms     printargs
 #define        sys_quotactl            printargs
 #define        sys_bdflush             printargs
@@ -62,7 +61,6 @@
 #define        sys_swapon              sys_chdir
 #define        sys_swapoff             sys_chdir
 #define        sys_clone               sys_fork
-#define        sys_create_module       sys_sethostname
 #define        sys_delete_module       sys_chdir
 #define        sys_fchdir              sys_close
 #define        sys_setfsuid            sys_setuid
@@ -206,4 +204,6 @@
 #define        sys_fstat               printargs
 #define        sys_personality         printargs
 #define sys_poll               printargs
+#define        sys_create_module       printargs
+#define        sys_init_module         printargs
 #endif

diff --git a/system.c b/system.c
index 3d9cbb02c92324bdcaa8ec38174e3a542c4e6738..f1f1fbe2f29cd52d4dfee9ca5b49d33bf9a18aff 100644 (file)
--- a/system.c
+++ b/system.c
@@ -1589,3 +1589,26 @@ struct tcb *tcp;
 }
 #endif
 
+#ifdef LINUX
+int
+sys_create_module(tcp)
+struct tcb *tcp;
+{
+       if (entering(tcp)) {
+               printpath(tcp, tcp->u_arg[0]);
+               tprintf(", %lu", tcp->u_arg[1]);
+       }
+       return RVAL_HEX;
+}
+
+int
+sys_init_module(tcp)
+struct tcb *tcp;
+{
+       if (entering(tcp)) {
+               printpath(tcp, tcp->u_arg[0]);
+               tprintf(", %#lx", tcp->u_arg[1]);
+       }
+       return 0;
+}
+#endif