*** empty log message ***

This commit is contained in:
Eric Andersen 2001-04-05 06:24:28 +00:00
parent a2a978ae23
commit acc7757312
3 changed files with 35 additions and 11 deletions

View File

@ -117,7 +117,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1; static const int MODUTILS_MODULE_H = 1;
#ident "$Id: insmod.c,v 1.55 2001/04/05 06:08:14 andersen Exp $" #ident "$Id: insmod.c,v 1.56 2001/04/05 06:24:27 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
@ -267,7 +267,7 @@ static const int NEW_MOD_AUTOCLEAN = 4;
static const int NEW_MOD_VISITED = 8; static const int NEW_MOD_VISITED = 8;
static const int NEW_MOD_USED_ONCE = 16; static const int NEW_MOD_USED_ONCE = 16;
int new_sys_init_module(const char *name, const struct new_module *); int init_module(const char *name, const struct new_module *);
int query_module(const char *name, int which, void *buf, size_t bufsize, int query_module(const char *name, int which, void *buf, size_t bufsize,
size_t *ret); size_t *ret);
@ -323,7 +323,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1; static const int MODUTILS_OBJ_H = 1;
#ident "$Id: insmod.c,v 1.55 2001/04/05 06:08:14 andersen Exp $" #ident "$Id: insmod.c,v 1.56 2001/04/05 06:24:27 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -2515,7 +2515,7 @@ new_init_module(const char *m_name, struct obj_file *f,
image = xmalloc(m_size); image = xmalloc(m_size);
obj_create_image(f, image); obj_create_image(f, image);
ret = new_sys_init_module(m_name, (struct new_module *) image); ret = init_module(m_name, (struct new_module *) image);
if (ret) if (ret)
perror_msg("init_module: %s", m_name); perror_msg("init_module: %s", m_name);

View File

@ -31,9 +31,33 @@
#include <asm/unistd.h> #include <asm/unistd.h>
#include "libbb.h" #include "libbb.h"
#define __NR_new_sys_init_module __NR_init_module
_syscall2(int, new_sys_init_module, const char *, name, struct old_module_ref
const struct new_module *, info); {
unsigned long module; /* kernel addresses */
unsigned long next;
};
struct old_module_symbol
{
unsigned long addr;
unsigned long name;
};
struct old_symbol_table
{
int size; /* total, including string table!!! */
int n_symbols;
int n_refs;
struct old_module_symbol symbol[0]; /* actual size defined by n_symbols */
struct old_module_ref ref[0]; /* actual size defined by n_refs */
};
struct old_mod_routines
{
unsigned long init;
unsigned long cleanup;
};
#define __NR_old_sys_init_module __NR_init_module #define __NR_old_sys_init_module __NR_init_module
_syscall5(int, old_sys_init_module, const char *, name, char *, code, _syscall5(int, old_sys_init_module, const char *, name, char *, code,

View File

@ -117,7 +117,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1; static const int MODUTILS_MODULE_H = 1;
#ident "$Id: insmod.c,v 1.55 2001/04/05 06:08:14 andersen Exp $" #ident "$Id: insmod.c,v 1.56 2001/04/05 06:24:27 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
@ -267,7 +267,7 @@ static const int NEW_MOD_AUTOCLEAN = 4;
static const int NEW_MOD_VISITED = 8; static const int NEW_MOD_VISITED = 8;
static const int NEW_MOD_USED_ONCE = 16; static const int NEW_MOD_USED_ONCE = 16;
int new_sys_init_module(const char *name, const struct new_module *); int init_module(const char *name, const struct new_module *);
int query_module(const char *name, int which, void *buf, size_t bufsize, int query_module(const char *name, int which, void *buf, size_t bufsize,
size_t *ret); size_t *ret);
@ -323,7 +323,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1; static const int MODUTILS_OBJ_H = 1;
#ident "$Id: insmod.c,v 1.55 2001/04/05 06:08:14 andersen Exp $" #ident "$Id: insmod.c,v 1.56 2001/04/05 06:24:27 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -2515,7 +2515,7 @@ new_init_module(const char *m_name, struct obj_file *f,
image = xmalloc(m_size); image = xmalloc(m_size);
obj_create_image(f, image); obj_create_image(f, image);
ret = new_sys_init_module(m_name, (struct new_module *) image); ret = init_module(m_name, (struct new_module *) image);
if (ret) if (ret)
perror_msg("init_module: %s", m_name); perror_msg("init_module: %s", m_name);