>Number:         19047
>Category:       kern
>Synopsis:       sysctl can't compile on MIPS after recent compat linux changes
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 14 02:56:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 1.6K
>Organization:
	FUKAUMI Naoki
>Environment:
System: NetBSD nforce.naobsd.org 1.6K NetBSD 1.6K (NFORCE) #0: Wed Nov 13 21:03:24 JST 2002 fun@nforce.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/NFORCE i386
Architecture: i386
Machine: i386
>Description:
	I can't compile sysctl for hpcmips with today source. common/ and
	arch/mips/ linux_exec.h has duplicate #define.

	Recent compat linux ELF copyargs function changes are incomplete
	on MIPS port.

>How-To-Repeat:
	make snapshot

>Fix:
	I can compile sysctl with this patch. No test.
	I don't know if it is correct for kernel.
	
Index: linux_exec.h
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/mips/linux_exec.h,v
retrieving revision 1.6
diff -u -r1.6 linux_exec.h
--- linux_exec.h	2002/11/13 15:16:31	1.6
+++ linux_exec.h	2002/11/14 10:52:29
@@ -61,8 +61,6 @@
 #define LINUX_ATEXIT_SIGNATURE 1
 #define LINUX_GCC_SIGNATURE 1
 
-#define LINUX_ELF_AUX_ENTRIES 14
-
 #define LINUX_ELF_AUX_ARGSIZ \
     ((howmany(LINUX_ELF_AUX_ENTRIES * sizeof(LinuxAuxInfo), sizeof(Elf32_Addr))))
 
@@ -79,18 +77,5 @@
 #else
 #define LinuxAuxInfo LinuxAux32Info
 #endif
-
-#ifdef _KERNEL
-__BEGIN_DECLS
-#ifdef EXEC_ELF32
-int linux_elf32_copyargs __P((struct proc *, struct exec_package *,
-    struct ps_strings *, char **, void *)); 
-#endif
-#ifdef EXEC_ELF64
-int linux_elf64_copyargs __P((struct proc *, struct exec_package *,
-    struct ps_strings *, char **, void *)); 
-#endif
-__END_DECLS
-#endif /* _KERNEL */
 
 #endif /* !_MIPS_LINUX_EXEC_H */
>Release-Note:
>Audit-Trail:
>Unformatted: