summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-08-21 19:38:49 +0000
committerEric Andersen2000-08-21 19:38:49 +0000
commitc86e5e614563349963693ae56e77240bf64682bf (patch)
treeb110fcea427c4834a21a5a6255305a0f35725612
parentbe0dc0d06a730bd3a9e7567af6918a673d5135ee (diff)
downloadbusybox-c86e5e614563349963693ae56e77240bf64682bf.zip
busybox-c86e5e614563349963693ae56e77240bf64682bf.tar.gz
Some leftover stuff I forgot to commit for the lsmod change.
-Erik
-rw-r--r--insmod.c9
-rw-r--r--modutils/insmod.c9
-rw-r--r--utility.c7
3 files changed, 11 insertions, 14 deletions
diff --git a/insmod.c b/insmod.c
index 7b637ef..0b06b5c 100644
--- a/insmod.c
+++ b/insmod.c
@@ -70,7 +70,7 @@
#ifndef MODUTILS_MODULE_H
#define MODUTILS_MODULE_H 1
-#ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
+#ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
@@ -276,7 +276,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H
#define MODUTILS_OBJ_H 1
-#ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
+#ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */
@@ -529,11 +529,6 @@ _syscall2(int, new_sys_init_module, const char *, name,
_syscall5(int, old_sys_init_module, const char *, name, char *, code,
unsigned, codesize, struct old_mod_routines *, routines,
struct old_symbol_table *, symtab)
-#ifndef __NR_query_module
-#define __NR_query_module 167
-#endif
-_syscall5(int, query_module, const char *, name, int, which,
- void *, buf, size_t, bufsize, size_t*, ret);
#ifndef BB_RMMOD
_syscall1(int, delete_module, const char *, name)
#else
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 7b637ef..0b06b5c 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -70,7 +70,7 @@
#ifndef MODUTILS_MODULE_H
#define MODUTILS_MODULE_H 1
-#ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
+#ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
@@ -276,7 +276,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H
#define MODUTILS_OBJ_H 1
-#ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
+#ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */
@@ -529,11 +529,6 @@ _syscall2(int, new_sys_init_module, const char *, name,
_syscall5(int, old_sys_init_module, const char *, name, char *, code,
unsigned, codesize, struct old_mod_routines *, routines,
struct old_symbol_table *, symtab)
-#ifndef __NR_query_module
-#define __NR_query_module 167
-#endif
-_syscall5(int, query_module, const char *, name, int, which,
- void *, buf, size_t, bufsize, size_t*, ret);
#ifndef BB_RMMOD
_syscall1(int, delete_module, const char *, name)
#else
diff --git a/utility.c b/utility.c
index 28e333e..e7abee8 100644
--- a/utility.c
+++ b/utility.c
@@ -153,6 +153,13 @@ extern _syscall5(int, mount, const char *, special_file, const char *, dir,
const char *, fstype, unsigned long int, rwflag, const void *, data);
#endif
+#if defined BB_INSMOD || defined BB_LSMOD
+#ifndef __NR_query_module
+#define __NR_query_module 167
+#endif
+_syscall5(int, query_module, const char *, name, int, which,
+ void *, buf, size_t, bufsize, size_t*, ret);
+#endif
#if defined (BB_CP_MV) || defined (BB_DU)