summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen1999-12-17 01:08:27 +0000
committerErik Andersen1999-12-17 01:08:27 +0000
commit6da0ae8183a31d4faab745d534a363c7e66ef864 (patch)
treeace76c8f54a854d9e24d303e4fbe4564425b233b
parentc144e330c0342a8ed0c9d917fd5a064317652c8a (diff)
downloadbusybox-6da0ae8183a31d4faab745d534a363c7e66ef864.zip
busybox-6da0ae8183a31d4faab745d534a363c7e66ef864.tar.gz
Minor fixes to rmmod. First pass at insmod (not yet working).
-Erik
-rw-r--r--applets/busybox.c3
-rw-r--r--busybox.c3
-rw-r--r--busybox.def.h1
-rw-r--r--internal.h1
-rw-r--r--modutils/rmmod.c2
-rw-r--r--rmmod.c2
6 files changed, 10 insertions, 2 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index a9cd6e0..895accd 100644
--- 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 a9cd6e0..895accd 100644
--- 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 a86550e..0655d3e 100644
--- 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 9b51edc..6bb9341 100644
--- 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 650a5b0..6b15b48 100644
--- 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 650a5b0..6b15b48 100644
--- 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[] =