Re: can't compile kernel for i386

[Roy Marples <roy%NetBSD.org@localhost>]

Kurt Schreiner wrote:
> Hi,
>
> with -current source cvs updated ca. Sep  2 21:20 MEST compiling
> a new kernel (using build.sh ... -u ...) fails in nfs_syscall.c
>
> Kurt
>
>     compile  PADDI/nfs_syscalls.o
> cc1: warnings being treated as errors
> /u/NetBSD/src/sys/nfs/nfs_syscalls.c: In function 'nfssvc_addsock':
> /u/NetBSD/src/sys/nfs/nfs_syscalls.c:410: warning: assignment from incompatible 
> pointer type
> --- nfs_syscalls.o ---
> *** [nfs_syscalls.o] Error code 1
> 1 error
>
> nbmake: stopped in /u/NetBSD/arch/i386/obj/sys/arch/i386/compile/PADDI
>
> ERROR: Failed to make all in 
> "/u/NetBSD/arch/i386/obj/sys/arch/i386/compile/PADDI"
> *** BUILD ABORTED ***

The attached patch should fix - ok to commit?

Thanks

Roy

Index: netsmb/smb_trantcp.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.42
diff -u -p -r1.42 smb_trantcp.c
--- netsmb/smb_trantcp.c        29 Mar 2009 19:21:20 -0000      1.42
+++ netsmb/smb_trantcp.c        2 Sep 2009 22:21:37 -0000
@@ -127,7 +127,7 @@ nb_intr(struct nbpcb *nbp, struct lwp *l
 }
 
 static void
-nb_upcall(struct socket *so, void *arg, int waitflag)
+nb_upcall(struct socket *so, void *arg, int events, int waitflag)
 {
        struct nbpcb *nbp = (void *)arg;
 
Index: nfs/nfs_srvsocket.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_srvsocket.c,v
retrieving revision 1.3
diff -u -p -r1.3 nfs_srvsocket.c
--- nfs/nfs_srvsocket.c 14 Mar 2009 15:36:24 -0000      1.3
+++ nfs/nfs_srvsocket.c 2 Sep 2009 22:21:37 -0000
@@ -110,7 +110,7 @@ int (*nfsrv3_procs[NFS_NPROCS])(struct n
  * The void *arg is a pointer to the "struct nfssvc_sock".
  */
 void
-nfsrv_soupcall(struct socket *so, void *arg, int waitflag)
+nfsrv_soupcall(struct socket *so, void *arg, int events, int waitflag)
 {
        struct nfssvc_sock *slp = (struct nfssvc_sock *)arg;
 
Index: nfs/nfs_var.h
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_var.h,v
retrieving revision 1.88
diff -u -p -r1.88 nfs_var.h
--- nfs/nfs_var.h       7 Jul 2009 14:09:05 -0000       1.88
+++ nfs/nfs_var.h       2 Sep 2009 22:21:37 -0000
@@ -183,7 +183,7 @@ void nfs_timer_srvfini(void);
 int nfs_sigintr(struct nfsmount *, struct nfsreq *, struct lwp *);
 int nfs_getreq(struct nfsrv_descript *, struct nfsd *, int);
 int nfs_msg(struct lwp *, const char *, const char *);
-void nfsrv_soupcall(struct socket *, void *, int);
+void nfsrv_soupcall(struct socket *, void *, int, int);
 void nfsrv_rcv(struct nfssvc_sock *);
 int nfsrv_getstream(struct nfssvc_sock *, int);
 int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *, struct nfsrv_descript **,