From 2f473da12babff710bbe37c7f95be01fd00118f9 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Mon, 1 Nov 1999 19:53:31 +0000 Subject: [PATCH] Fix duplicate for sys_create_module Include linux/in6.h only for Linux MIPS --- ChangeLog | 6 ++++++ bjm.c | 10 ++++++++++ cvsbuild | 2 +- net.c | 3 ++- system.c | 23 ----------------------- 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 486cf67e..b13824f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 1 20:52:08 CET 1999 Wichert Akkerman + + * Move Linux kernelmodule-functions from system.c to bjm.c and + remove duplicate for sys_create_module + * Play with #ifdef's in net.c to get IPv6 right on Linux MIPS + Sun Oct 31 22:03:00 CET 1999 Wichert Akkerman * Merge Linux mips patch from Florian Lohoff diff --git a/bjm.c b/bjm.c index 347a82dc..cf7f4e87 100644 --- a/bjm.c +++ b/bjm.c @@ -62,5 +62,15 @@ struct tcb *tcp; return RVAL_HEX; } +int +sys_init_module(tcp) +struct tcb *tcp; +{ + if (entering(tcp)) { + printpath(tcp, tcp->u_arg[0]); + tprintf(", %#lx", tcp->u_arg[1]); + } + return 0; +} #endif /* LINUX */ diff --git a/cvsbuild b/cvsbuild index a4415016..4668adcf 100755 --- a/cvsbuild +++ b/cvsbuild @@ -18,5 +18,5 @@ fi autoheader autoconf -./configure $@ + diff --git a/net.c b/net.c index 8cbfece1..7e5c4b93 100644 --- a/net.c +++ b/net.c @@ -45,10 +45,11 @@ #endif #endif /* LINUX */ - +#if defined(LINUX) && defined(MIPS) #if defined( HAVE_LINUX_IN6_H) #include #endif +#endif #ifndef PF_UNSPEC #define PF_UNSPEC AF_UNSPEC diff --git a/system.c b/system.c index 361e6e47..15ea7917 100644 --- a/system.c +++ b/system.c @@ -1602,26 +1602,3 @@ struct tcb *tcp; } #endif -#ifdef LINUX -int -sys_create_module(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - printpath(tcp, tcp->u_arg[0]); - tprintf(", %lu", tcp->u_arg[1]); - } - return RVAL_HEX; -} - -int -sys_init_module(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - printpath(tcp, tcp->u_arg[0]); - tprintf(", %#lx", tcp->u_arg[1]); - } - return 0; -} -#endif -- 2.40.0