aboutsummaryrefslogtreecommitdiff
path: root/modutils/insmod.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-10-10 04:20:21 +0000
committerEric Andersen <andersen@codepoet.org>2002-10-10 04:20:21 +0000
commit71ae64bdc6b044eef0a9f3bebd85cc4a6b67362f (patch)
tree802990cf39a805f253b9d32f3888a7c749babd01 /modutils/insmod.c
parentfdfe298a966da0e6eecdc355efd640acf73c00e5 (diff)
downloadbusybox-w32-71ae64bdc6b044eef0a9f3bebd85cc4a6b67362f.tar.gz
busybox-w32-71ae64bdc6b044eef0a9f3bebd85cc4a6b67362f.tar.bz2
busybox-w32-71ae64bdc6b044eef0a9f3bebd85cc4a6b67362f.zip
last_patch61 from vodz:
New complex patch for decrease size devel version. Requires previous patch. Also removed small problems from dutmp and tar applets. Also includes vodz' last_patch61_2: Last patch correcting comment for #endif and more integrated with libbb (very reduce size if used "cat" applet also). Requires last_patch61 for modutils/config.in.
Diffstat (limited to 'modutils/insmod.c')
-rw-r--r--modutils/insmod.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index b246d90af..b367e84af 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -234,7 +234,7 @@
234#ifndef MODUTILS_MODULE_H 234#ifndef MODUTILS_MODULE_H
235static const int MODUTILS_MODULE_H = 1; 235static const int MODUTILS_MODULE_H = 1;
236 236
237#ident "$Id: insmod.c,v 1.90 2002/09/16 05:30:24 andersen Exp $" 237#ident "$Id: insmod.c,v 1.91 2002/10/10 04:20:21 andersen Exp $"
238 238
239/* This file contains the structures used by the 2.0 and 2.1 kernels. 239/* This file contains the structures used by the 2.0 and 2.1 kernels.
240 We do not use the kernel headers directly because we do not wish 240 We do not use the kernel headers directly because we do not wish
@@ -455,7 +455,7 @@ int delete_module(const char *);
455#ifndef MODUTILS_OBJ_H 455#ifndef MODUTILS_OBJ_H
456static const int MODUTILS_OBJ_H = 1; 456static const int MODUTILS_OBJ_H = 1;
457 457
458#ident "$Id: insmod.c,v 1.90 2002/09/16 05:30:24 andersen Exp $" 458#ident "$Id: insmod.c,v 1.91 2002/10/10 04:20:21 andersen Exp $"
459 459
460/* The relocatable object is manipulated using elfin types. */ 460/* The relocatable object is manipulated using elfin types. */
461 461
@@ -3422,6 +3422,7 @@ static void hide_special_symbols(struct obj_file *f)
3422 ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info)); 3422 ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info));
3423} 3423}
3424 3424
3425#ifdef CONFIG_FEATURE_CHECK_TAINTED_MODULE
3425static int obj_gpl_license(struct obj_file *f, const char **license) 3426static int obj_gpl_license(struct obj_file *f, const char **license)
3426{ 3427{
3427 struct obj_section *sec; 3428 struct obj_section *sec;
@@ -3533,6 +3534,9 @@ static void check_tainted_module(struct obj_file *f, char *m_name)
3533 if (fd >= 0) 3534 if (fd >= 0)
3534 close(fd); 3535 close(fd);
3535} 3536}
3537#else /* CONFIG_FEATURE_CHECK_TAINTED_MODULE */
3538#define check_tainted_module(x, y) do { } while(0);
3539#endif /* CONFIG_FEATURE_CHECK_TAINTED_MODULE */
3536 3540
3537extern int insmod_main( int argc, char **argv) 3541extern int insmod_main( int argc, char **argv)
3538{ 3542{