From 5f31681a57f6531b49770b2a254de4a3442b8c14 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Wed, 14 Jun 2000 18:35:03 +0000 Subject: merge to new modutils (cross fingers) --- isys/otherinsmod.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'isys/otherinsmod.c') diff --git a/isys/otherinsmod.c b/isys/otherinsmod.c index 5eb65d1bd..146c50113 100644 --- a/isys/otherinsmod.c +++ b/isys/otherinsmod.c @@ -11,9 +11,8 @@ #include "isys.h" /* hack */ -int insmod_main(int argc, char ** argv); -int insmod64_main(int argc, char ** argv); -int rmmod_main(int argc, char ** argv); +int combined_insmod_main(int argc, char ** argv); +int combined_insmod64_main(int argc, char ** argv); int ourInsmodCommand(int argc, char ** argv) { char * file; @@ -91,10 +90,10 @@ int ourInsmodCommand(int argc, char ** argv) { #ifdef __sparc__ if (sparc64) - rc = insmod64_main(argc, argv); + rc = combined_insmod64_main(argc, argv); else #endif - rc = insmod_main(argc, argv); + rc = combined_insmod_main(argc, argv); if (rmObj) unlink(file); @@ -109,7 +108,7 @@ int rmmod(char * modName) { int rc = 0; if ((child = fork()) == 0) { - exit(rmmod_main(argc, argv)); + exit(combined_insmod_main(argc, argv)); } waitpid(child, &status, 0); -- cgit