From 6da0ae8183a31d4faab745d534a363c7e66ef864 Mon Sep 17 00:00:00 2001 From: Erik Andersen Date: Fri, 17 Dec 1999 01:08:27 +0000 Subject: Minor fixes to rmmod. First pass at insmod (not yet working). -Erik --- applets/busybox.c | 3 +++ busybox.c | 3 +++ busybox.def.h | 1 + internal.h | 1 + modutils/rmmod.c | 2 +- rmmod.c | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/applets/busybox.c b/applets/busybox.c index a9cd6e079..895accd93 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 a9cd6e079..895accd93 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 a86550e3b..0655d3ec7 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 9b51edcd2..6bb9341ef 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 650a5b04f..6b15b48bb 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 650a5b04f..6b15b48bb 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[] = -- cgit v1.2.3