diff options
author | Eric Andersen <andersen@codepoet.org> | 2000-08-21 19:38:49 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2000-08-21 19:38:49 +0000 |
commit | c86e5e614563349963693ae56e77240bf64682bf (patch) | |
tree | b110fcea427c4834a21a5a6255305a0f35725612 | |
parent | be0dc0d06a730bd3a9e7567af6918a673d5135ee (diff) | |
download | busybox-w32-c86e5e614563349963693ae56e77240bf64682bf.tar.gz busybox-w32-c86e5e614563349963693ae56e77240bf64682bf.tar.bz2 busybox-w32-c86e5e614563349963693ae56e77240bf64682bf.zip |
Some leftover stuff I forgot to commit for the lsmod change.
-Erik
-rw-r--r-- | insmod.c | 9 | ||||
-rw-r--r-- | modutils/insmod.c | 9 | ||||
-rw-r--r-- | utility.c | 7 |
3 files changed, 11 insertions, 14 deletions
@@ -70,7 +70,7 @@ | |||
70 | #ifndef MODUTILS_MODULE_H | 70 | #ifndef MODUTILS_MODULE_H |
71 | #define MODUTILS_MODULE_H 1 | 71 | #define MODUTILS_MODULE_H 1 |
72 | 72 | ||
73 | #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $" | 73 | #ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $" |
74 | 74 | ||
75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
76 | We do not use the kernel headers directly because we do not wish | 76 | We do not use the kernel headers directly because we do not wish |
@@ -276,7 +276,7 @@ int delete_module(const char *); | |||
276 | #ifndef MODUTILS_OBJ_H | 276 | #ifndef MODUTILS_OBJ_H |
277 | #define MODUTILS_OBJ_H 1 | 277 | #define MODUTILS_OBJ_H 1 |
278 | 278 | ||
279 | #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $" | 279 | #ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $" |
280 | 280 | ||
281 | /* The relocatable object is manipulated using elfin types. */ | 281 | /* The relocatable object is manipulated using elfin types. */ |
282 | 282 | ||
@@ -529,11 +529,6 @@ _syscall2(int, new_sys_init_module, const char *, name, | |||
529 | _syscall5(int, old_sys_init_module, const char *, name, char *, code, | 529 | _syscall5(int, old_sys_init_module, const char *, name, char *, code, |
530 | unsigned, codesize, struct old_mod_routines *, routines, | 530 | unsigned, codesize, struct old_mod_routines *, routines, |
531 | struct old_symbol_table *, symtab) | 531 | struct old_symbol_table *, symtab) |
532 | #ifndef __NR_query_module | ||
533 | #define __NR_query_module 167 | ||
534 | #endif | ||
535 | _syscall5(int, query_module, const char *, name, int, which, | ||
536 | void *, buf, size_t, bufsize, size_t*, ret); | ||
537 | #ifndef BB_RMMOD | 532 | #ifndef BB_RMMOD |
538 | _syscall1(int, delete_module, const char *, name) | 533 | _syscall1(int, delete_module, const char *, name) |
539 | #else | 534 | #else |
diff --git a/modutils/insmod.c b/modutils/insmod.c index 7b637ef45..0b06b5c40 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -70,7 +70,7 @@ | |||
70 | #ifndef MODUTILS_MODULE_H | 70 | #ifndef MODUTILS_MODULE_H |
71 | #define MODUTILS_MODULE_H 1 | 71 | #define MODUTILS_MODULE_H 1 |
72 | 72 | ||
73 | #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $" | 73 | #ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $" |
74 | 74 | ||
75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
76 | We do not use the kernel headers directly because we do not wish | 76 | We do not use the kernel headers directly because we do not wish |
@@ -276,7 +276,7 @@ int delete_module(const char *); | |||
276 | #ifndef MODUTILS_OBJ_H | 276 | #ifndef MODUTILS_OBJ_H |
277 | #define MODUTILS_OBJ_H 1 | 277 | #define MODUTILS_OBJ_H 1 |
278 | 278 | ||
279 | #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $" | 279 | #ident "$Id: insmod.c,v 1.21 2000/08/21 19:38:49 andersen Exp $" |
280 | 280 | ||
281 | /* The relocatable object is manipulated using elfin types. */ | 281 | /* The relocatable object is manipulated using elfin types. */ |
282 | 282 | ||
@@ -529,11 +529,6 @@ _syscall2(int, new_sys_init_module, const char *, name, | |||
529 | _syscall5(int, old_sys_init_module, const char *, name, char *, code, | 529 | _syscall5(int, old_sys_init_module, const char *, name, char *, code, |
530 | unsigned, codesize, struct old_mod_routines *, routines, | 530 | unsigned, codesize, struct old_mod_routines *, routines, |
531 | struct old_symbol_table *, symtab) | 531 | struct old_symbol_table *, symtab) |
532 | #ifndef __NR_query_module | ||
533 | #define __NR_query_module 167 | ||
534 | #endif | ||
535 | _syscall5(int, query_module, const char *, name, int, which, | ||
536 | void *, buf, size_t, bufsize, size_t*, ret); | ||
537 | #ifndef BB_RMMOD | 532 | #ifndef BB_RMMOD |
538 | _syscall1(int, delete_module, const char *, name) | 533 | _syscall1(int, delete_module, const char *, name) |
539 | #else | 534 | #else |
@@ -153,6 +153,13 @@ extern _syscall5(int, mount, const char *, special_file, const char *, dir, | |||
153 | const char *, fstype, unsigned long int, rwflag, const void *, data); | 153 | const char *, fstype, unsigned long int, rwflag, const void *, data); |
154 | #endif | 154 | #endif |
155 | 155 | ||
156 | #if defined BB_INSMOD || defined BB_LSMOD | ||
157 | #ifndef __NR_query_module | ||
158 | #define __NR_query_module 167 | ||
159 | #endif | ||
160 | _syscall5(int, query_module, const char *, name, int, which, | ||
161 | void *, buf, size_t, bufsize, size_t*, ret); | ||
162 | #endif | ||
156 | 163 | ||
157 | 164 | ||
158 | #if defined (BB_CP_MV) || defined (BB_DU) | 165 | #if defined (BB_CP_MV) || defined (BB_DU) |