aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-09-22 00:38:07 +0000
committerEric Andersen <andersen@codepoet.org>2000-09-22 00:38:07 +0000
commit8c185f9600dce42234a407992323af3cc4c8f989 (patch)
tree79129b9dada99e6aa2212fdf28be96e40ad834fa
parent75610e18b3fb9366e73dec22c15c437b00afc812 (diff)
downloadbusybox-w32-8c185f9600dce42234a407992323af3cc4c8f989.tar.gz
busybox-w32-8c185f9600dce42234a407992323af3cc4c8f989.tar.bz2
busybox-w32-8c185f9600dce42234a407992323af3cc4c8f989.zip
Fix for bug #1042 -- applied the patch from Larry Doolittle
<ldoolitt@recycle.lbl.gov> to fix the bug. -Erik
-rw-r--r--insmod.c8
-rw-r--r--modutils/insmod.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/insmod.c b/insmod.c
index 4e159be5d..b0e797af7 100644
--- a/insmod.c
+++ b/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.22 2000/08/22 05:18:30 andersen Exp $" 73#ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 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.22 2000/08/22 05:18:30 andersen Exp $" 279#ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 andersen Exp $"
280 280
281/* The relocatable object is manipulated using elfin types. */ 281/* The relocatable object is manipulated using elfin types. */
282 282
@@ -1309,7 +1309,7 @@ old_get_module_version(struct obj_file *f, char str[STRVERSIONLEN])
1309 1309
1310/* Fetch all the symbols and divvy them up as appropriate for the modules. */ 1310/* Fetch all the symbols and divvy them up as appropriate for the modules. */
1311 1311
1312static int old_get_kernel_symbols(void) 1312static int old_get_kernel_symbols(const char *m_name)
1313{ 1313{
1314 struct old_kernel_sym *ks, *k; 1314 struct old_kernel_sym *ks, *k;
1315 struct new_module_symbol *s; 1315 struct new_module_symbol *s;
@@ -2758,7 +2758,7 @@ extern int insmod_main( int argc, char **argv)
2758#endif 2758#endif
2759 } else { 2759 } else {
2760#ifdef BB_FEATURE_INSMOD_OLD_KERNEL 2760#ifdef BB_FEATURE_INSMOD_OLD_KERNEL
2761 if (!old_get_kernel_symbols()) 2761 if (!old_get_kernel_symbols(m_name))
2762 goto out; 2762 goto out;
2763 k_crcs = old_is_kernel_checksummed(); 2763 k_crcs = old_is_kernel_checksummed();
2764#else 2764#else
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 4e159be5d..b0e797af7 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.22 2000/08/22 05:18:30 andersen Exp $" 73#ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 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.22 2000/08/22 05:18:30 andersen Exp $" 279#ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 andersen Exp $"
280 280
281/* The relocatable object is manipulated using elfin types. */ 281/* The relocatable object is manipulated using elfin types. */
282 282
@@ -1309,7 +1309,7 @@ old_get_module_version(struct obj_file *f, char str[STRVERSIONLEN])
1309 1309
1310/* Fetch all the symbols and divvy them up as appropriate for the modules. */ 1310/* Fetch all the symbols and divvy them up as appropriate for the modules. */
1311 1311
1312static int old_get_kernel_symbols(void) 1312static int old_get_kernel_symbols(const char *m_name)
1313{ 1313{
1314 struct old_kernel_sym *ks, *k; 1314 struct old_kernel_sym *ks, *k;
1315 struct new_module_symbol *s; 1315 struct new_module_symbol *s;
@@ -2758,7 +2758,7 @@ extern int insmod_main( int argc, char **argv)
2758#endif 2758#endif
2759 } else { 2759 } else {
2760#ifdef BB_FEATURE_INSMOD_OLD_KERNEL 2760#ifdef BB_FEATURE_INSMOD_OLD_KERNEL
2761 if (!old_get_kernel_symbols()) 2761 if (!old_get_kernel_symbols(m_name))
2762 goto out; 2762 goto out;
2763 k_crcs = old_is_kernel_checksummed(); 2763 k_crcs = old_is_kernel_checksummed();
2764#else 2764#else