[src/trunk]: src/sys/compat/linux/arch/amd64 PR/32303: Nicolas Joly: Fix -cur...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf913de61f46
branches:  trunk
changeset: 586378:cf913de61f46
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 16 14:16:14 2005 +0000

description:
PR/32303: Nicolas Joly: Fix -current amd64 kernel compilation failure with
options COMPAT_LINUX

diffstat:

 sys/compat/linux/arch/amd64/linux_exec.h         |   4 ++--
 sys/compat/linux/arch/amd64/linux_exec_machdep.c |  15 ++++++++-------
 sys/compat/linux/arch/amd64/linux_machdep.c      |   8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diffs (103 lines):

diff -r 96600a9e008b -r cf913de61f46 sys/compat/linux/arch/amd64/linux_exec.h
--- a/sys/compat/linux/arch/amd64/linux_exec.h  Fri Dec 16 11:27:33 2005 +0000
+++ b/sys/compat/linux/arch/amd64/linux_exec.h  Fri Dec 16 14:16:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_exec.h,v 1.2 2005/12/11 12:20:14 christos Exp $ */
+/*     $NetBSD: linux_exec.h,v 1.3 2005/12/16 14:16:14 christos Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -63,6 +63,6 @@
 /* we have special powerpc ELF copyargs */
 #define LINUX_MACHDEP_ELF_COPYARGS
 
-int linux_exec_setup_stack(struct proc *, struct exec_package *);
+int linux_exec_setup_stack(struct lwp *, struct exec_package *);
 
 #endif /* !_AMD64_LINUX_EXEC_H */
diff -r 96600a9e008b -r cf913de61f46 sys/compat/linux/arch/amd64/linux_exec_machdep.c
--- a/sys/compat/linux/arch/amd64/linux_exec_machdep.c  Fri Dec 16 11:27:33 2005 +0000
+++ b/sys/compat/linux/arch/amd64/linux_exec_machdep.c  Fri Dec 16 14:16:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_exec_machdep.c,v 1.4 2005/12/14 18:33:32 christos Exp $ */
+/*     $NetBSD: linux_exec_machdep.c,v 1.5 2005/12/16 14:16:14 christos Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.4 2005/12/14 18:33:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.5 2005/12/16 14:16:14 christos Exp $");
 
 #ifdef __amd64__
 #define ELFSIZE 64
@@ -119,8 +119,8 @@
 }
 
 int
-ELFNAME2(linux,copyargs)(p, pack, arginfo, stackp, argp)
-       struct proc *p;
+ELFNAME2(linux,copyargs)(l, pack, arginfo, stackp, argp)
+       struct lwp *l;
        struct exec_package *pack;
        struct ps_strings *arginfo;
        char **stackp;
@@ -128,7 +128,8 @@
 {
        struct linux_extra_stack_data64 *esdp, esd;
        struct elf_args *ap;
-       struct vattr *vap; 
+       struct vattr *vap;
+       struct proc *p = l->l_proc;
        Elf_Ehdr *eh;
        Elf_Phdr *ph;
        u_long phsize;
@@ -136,7 +137,7 @@
        int error;
        int i;
 
-       if ((error = copyargs(p, pack, arginfo, stackp, argp)) != 0)
+       if ((error = copyargs(l, pack, arginfo, stackp, argp)) != 0)
                return error;
 
        /*
@@ -155,7 +156,7 @@
        if (ap == NULL) {
                phsize = eh->e_phnum * sizeof(Elf_Phdr);
                ph = (Elf_Phdr *)malloc(phsize, M_TEMP, M_WAITOK);
-               error = exec_read_from(p, pack->ep_vp, eh->e_phoff, ph, phsize);
+               error = exec_read_from(l, pack->ep_vp, eh->e_phoff, ph, phsize);
                if (error != 0) {
                        for (i = 0; i < eh->e_phnum; i++) {
                                if (ph[i].p_type == PT_PHDR) {
diff -r 96600a9e008b -r cf913de61f46 sys/compat/linux/arch/amd64/linux_machdep.c
--- a/sys/compat/linux/arch/amd64/linux_machdep.c       Fri Dec 16 11:27:33 2005 +0000
+++ b/sys/compat/linux/arch/amd64/linux_machdep.c       Fri Dec 16 14:16:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_machdep.c,v 1.12 2005/12/11 12:20:14 christos Exp $ */
+/*     $NetBSD: linux_machdep.c,v 1.13 2005/12/16 14:16:14 christos Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.12 2005/12/11 12:20:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.13 2005/12/16 14:16:14 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -342,8 +342,8 @@
 }
 
 int  
-linux_machdepioctl(p, v, retval)
-        struct proc *p;
+linux_machdepioctl(l, v, retval)
+        struct lwp *l;
         void *v;
         register_t *retval;
 {