aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-03-19 21:00:03 +0000
committerEric Andersen <andersen@codepoet.org>2004-03-19 21:00:03 +0000
commit1daa0c609712e25a3a4dcd002f066a13dd8fb7ba (patch)
treed208a343ac18fc2eaef1dd08698fd6a90490670e
parent9e458f5b7a3a8c96dd801f8bdfcba5c8f67991ab (diff)
downloadbusybox-w32-1daa0c609712e25a3a4dcd002f066a13dd8fb7ba.tar.gz
busybox-w32-1daa0c609712e25a3a4dcd002f066a13dd8fb7ba.tar.bz2
busybox-w32-1daa0c609712e25a3a4dcd002f066a13dd8fb7ba.zip
As noted in a patch from Kendrick Hamilton, rmmod was only
half way converted, and still used the old delete_module(), call rather than a syscall, in one spot.
-rw-r--r--modutils/rmmod.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index cc9742c0a..c83904551 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -29,9 +29,6 @@
29#include <sys/syscall.h> 29#include <sys/syscall.h>
30#include "busybox.h" 30#include "busybox.h"
31 31
32extern int delete_module(const char * name);
33
34
35extern int rmmod_main(int argc, char **argv) 32extern int rmmod_main(int argc, char **argv)
36{ 33{
37 int n, ret = EXIT_SUCCESS; 34 int n, ret = EXIT_SUCCESS;
@@ -55,7 +52,7 @@ extern int rmmod_main(int argc, char **argv)
55 /* until the number of modules does not change */ 52 /* until the number of modules does not change */
56 buf = xmalloc(bufsize = 256); 53 buf = xmalloc(bufsize = 256);
57 while (nmod != pnmod) { 54 while (nmod != pnmod) {
58 if (delete_module(NULL)) 55 if (syscall(__NR_delete_module, NULL, flags) < 0)
59 bb_perror_msg_and_die("rmmod"); 56 bb_perror_msg_and_die("rmmod");
60 pnmod = nmod; 57 pnmod = nmod;
61 /* 1 == QM_MODULES */ 58 /* 1 == QM_MODULES */