From owner-p4-projects@FreeBSD.ORG Wed May 24 21:38:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45B0716A52B; Wed, 24 May 2006 21:38:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC07216A4C0 for ; Wed, 24 May 2006 21:38:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80B2D43D46 for ; Wed, 24 May 2006 21:38:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OLc2a3072826 for ; Wed, 24 May 2006 21:38:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OLc2mb072820 for perforce@freebsd.org; Wed, 24 May 2006 21:38:02 GMT (envelope-from jhb@freebsd.org) Date: Wed, 24 May 2006 21:38:02 GMT Message-Id: <200605242138.k4OLc2mb072820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 97768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 21:39:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=97768 Change 97768 by jhb@jhb_mutex on 2006/05/24 21:37:19 Various compile fixes. I had to turn off GPROF in winx32_wrap.S because it uses non-0xc3 ret instructions in two places and GPROF was giving it heartache. The winx64_wrap.S does not have the same issue so I have left it alone. Affected files ... .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#38 edit .. //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#4 edit .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#4 edit Differences ... ==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#38 (text+ko) ==== @@ -2894,7 +2894,7 @@ /* * See if a single module contains the symbols for a specified file. */ -static void +static int NdisCheckModule(linker_file_t lf, void *context) { struct ndis_checkmodule *nc; @@ -2908,7 +2908,7 @@ nc->fh->nf_vp = lf; nc->fh->nf_map = NULL; nc->fh->nf_type = NDIS_FH_TYPE_MODULE; - cn->fh->nf_maplen = (kldend - kldstart) & 0xFFFFFFFF; + nc->fh->nf_maplen = (kldend - kldstart) & 0xFFFFFFFF; return (1); } @@ -2931,7 +2931,6 @@ ndis_fh *fh; char *path; struct ndis_checkmodule nc; - linker_file_t head, lf; if (RtlUnicodeStringToAnsiString(&as, filename, TRUE)) { *status = NDIS_STATUS_RESOURCES; @@ -3051,6 +3050,7 @@ linker_file_t lf; caddr_t kldstart; int error, resid, vfslocked; + struct vnode *vp; if (filehandle == NULL) { *status = NDIS_STATUS_FAILURE; @@ -3088,8 +3088,9 @@ return; } + vp = fh->nf_vp; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - error = vn_rdwr(UIO_READ, fh->nf_vp, fh->nf_map, fh->nf_maplen, 0, + error = vn_rdwr(UIO_READ, vp, fh->nf_map, fh->nf_maplen, 0, UIO_SYSSPACE, 0, td->td_ucred, NOCRED, &resid, td); VFS_UNLOCK_GIANT(vfslocked); @@ -3127,6 +3128,7 @@ struct thread *td = curthread; ndis_fh *fh; int vfslocked; + struct vnode *vp; if (filehandle == NULL) return; @@ -3142,8 +3144,9 @@ return; if (fh->nf_type == NDIS_FH_TYPE_VFS) { + vp = fh->nf_vp; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vn_close(fh->nf_vp, FREAD, td->td_ucred, td); + vn_close(vp, FREAD, td->td_ucred, td); VFS_UNLOCK_GIANT(vfslocked); } ==== //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#4 (text+ko) ==== @@ -32,6 +32,11 @@ * $FreeBSD: src/sys/compat/ndis/winx32_wrap.S,v 1.4 2005/11/02 18:01:04 wpaul Exp $ */ +/* The 'ret' macro doesn't work in this file if GPROF is enabled. */ +#ifdef GPROF +#undef GPROF +#endif + #include /* ==== //depot/projects/smpng/sys/security/audit/audit_syscalls.c#4 (text) ==== @@ -30,6 +30,7 @@ */ #include +#include #include #include #include