Minor fixes to rmmod. First pass at insmod (not yet working).

 -Erik

diff --git a/applets/busybox.c b/applets/busybox.c
index a9cd6e07902c0cdba4eab0eee170e5bfa49c989b..895accd93be7fa44e82efaf0914ee537ba95b35e 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -87,6 +87,9 @@ static const struct Applet applets[] = {
 #ifdef BB_INIT                 //sbin
     {"init", init_main},
 #endif
+#ifdef BB_INSMOD               //sbin
+    {"insmod", insmod_main},
+#endif
 #ifdef BB_FEATURE_LINUXRC      //
     {"linuxrc", init_main},
 #endif

diff --git a/busybox.c b/busybox.c
index a9cd6e07902c0cdba4eab0eee170e5bfa49c989b..895accd93be7fa44e82efaf0914ee537ba95b35e 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -87,6 +87,9 @@ static const struct Applet applets[] = {
 #ifdef BB_INIT                 //sbin
     {"init", init_main},
 #endif
+#ifdef BB_INSMOD               //sbin
+    {"insmod", insmod_main},
+#endif
 #ifdef BB_FEATURE_LINUXRC      //
     {"linuxrc", init_main},
 #endif

diff --git a/busybox.def.h b/busybox.def.h
index a86550e3bdd81c92b95e14f487c162104c02603e..0655d3ec76376a733b400c2baaeb18b7979fd3b9 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -28,6 +28,7 @@
 #define BB_HEAD
 #define BB_HOSTNAME
 #define BB_INIT
+#define BB_INSMOD
 #define BB_KILL
 #define BB_KLOGD
 //#define BB_LENGTH

diff --git a/internal.h b/internal.h
index 9b51edcd29bc868f7861cc46ea8e8a16dfdbe175..6bb9341ef7a6b75f83434d28769185bb6089bc61 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -79,6 +79,7 @@ extern int halt_main(int argc, char** argv);
 extern int head_main(int argc, char** argv);
 extern int hostname_main(int argc, char** argv);
 extern int init_main(int argc, char** argv);
+extern int insmod_main(int argc, char** argv);
 extern int kill_main(int argc, char** argv);
 extern int length_main(int argc, char** argv);
 extern int ln_main(int argc, char** argv);

diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 650a5b04f996d2ef1baa8caf6d5352929a9e3e09..6b15b48bbe0323e98d6f5aca2667d1e018e386d7 100644 (file)
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -29,7 +29,7 @@
 
 
 /* And the system call of the day is...  */
-extern int delete_module (const char * __name);
+_syscall1(int, delete_module, const char *, name)
 
 
 static const char rmmod_usage[] =

diff --git a/rmmod.c b/rmmod.c
index 650a5b04f996d2ef1baa8caf6d5352929a9e3e09..6b15b48bbe0323e98d6f5aca2667d1e018e386d7 100644 (file)
--- a/rmmod.c
+++ b/rmmod.c
@@ -29,7 +29,7 @@
 
 
 /* And the system call of the day is...  */
-extern int delete_module (const char * __name);
+_syscall1(int, delete_module, const char *, name)
 
 
 static const char rmmod_usage[] =