Fix for bug #1042 -- applied the patch from Larry Doolittle

<ldoolitt@recycle.lbl.gov> to fix the bug.
 -Erik
This commit is contained in:
Eric Andersen 2000-09-22 00:38:07 +00:00
parent 75610e18b3
commit 8c185f9600
2 changed files with 8 additions and 8 deletions

View File

@ -70,7 +70,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
#define MODUTILS_MODULE_H 1 #define MODUTILS_MODULE_H 1
#ident "$Id: insmod.c,v 1.22 2000/08/22 05:18:30 andersen Exp $" #ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* 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 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 #ifndef MODUTILS_OBJ_H
#define MODUTILS_OBJ_H 1 #define MODUTILS_OBJ_H 1
#ident "$Id: insmod.c,v 1.22 2000/08/22 05:18:30 andersen Exp $" #ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -1309,7 +1309,7 @@ old_get_module_version(struct obj_file *f, char str[STRVERSIONLEN])
/* Fetch all the symbols and divvy them up as appropriate for the modules. */ /* Fetch all the symbols and divvy them up as appropriate for the modules. */
static int old_get_kernel_symbols(void) static int old_get_kernel_symbols(const char *m_name)
{ {
struct old_kernel_sym *ks, *k; struct old_kernel_sym *ks, *k;
struct new_module_symbol *s; struct new_module_symbol *s;
@ -2758,7 +2758,7 @@ extern int insmod_main( int argc, char **argv)
#endif #endif
} else { } else {
#ifdef BB_FEATURE_INSMOD_OLD_KERNEL #ifdef BB_FEATURE_INSMOD_OLD_KERNEL
if (!old_get_kernel_symbols()) if (!old_get_kernel_symbols(m_name))
goto out; goto out;
k_crcs = old_is_kernel_checksummed(); k_crcs = old_is_kernel_checksummed();
#else #else

View File

@ -70,7 +70,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
#define MODUTILS_MODULE_H 1 #define MODUTILS_MODULE_H 1
#ident "$Id: insmod.c,v 1.22 2000/08/22 05:18:30 andersen Exp $" #ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* 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 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 #ifndef MODUTILS_OBJ_H
#define MODUTILS_OBJ_H 1 #define MODUTILS_OBJ_H 1
#ident "$Id: insmod.c,v 1.22 2000/08/22 05:18:30 andersen Exp $" #ident "$Id: insmod.c,v 1.23 2000/09/22 00:38:07 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -1309,7 +1309,7 @@ old_get_module_version(struct obj_file *f, char str[STRVERSIONLEN])
/* Fetch all the symbols and divvy them up as appropriate for the modules. */ /* Fetch all the symbols and divvy them up as appropriate for the modules. */
static int old_get_kernel_symbols(void) static int old_get_kernel_symbols(const char *m_name)
{ {
struct old_kernel_sym *ks, *k; struct old_kernel_sym *ks, *k;
struct new_module_symbol *s; struct new_module_symbol *s;
@ -2758,7 +2758,7 @@ extern int insmod_main( int argc, char **argv)
#endif #endif
} else { } else {
#ifdef BB_FEATURE_INSMOD_OLD_KERNEL #ifdef BB_FEATURE_INSMOD_OLD_KERNEL
if (!old_get_kernel_symbols()) if (!old_get_kernel_symbols(m_name))
goto out; goto out;
k_crcs = old_is_kernel_checksummed(); k_crcs = old_is_kernel_checksummed();
#else #else