Date: Sun, 20 Jul 2008 12:16:00 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 145498 for review Message-ID: <200807201216.m6KCG0OY083867@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145498 Change 145498 by ed@ed_dull on 2008/07/20 12:15:53 IFC. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#3 integrate .. //depot/projects/mpsafetty/etc/ppp/ppp.conf#2 integrate .. //depot/projects/mpsafetty/etc/rc.d/bluetooth#2 integrate .. //depot/projects/mpsafetty/etc/rc.d/serial#2 integrate .. //depot/projects/mpsafetty/etc/rc.suspend#2 integrate .. //depot/projects/mpsafetty/etc/remote#2 integrate .. //depot/projects/mpsafetty/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/mpsafetty/sys/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/amd64/include/param.h#2 integrate .. //depot/projects/mpsafetty/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/toedev.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/vmmeter.h#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#2 integrate Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.152 2008/07/13 17:17:35 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.153 2008/07/19 18:21:52 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080719: sade(8) removed on all but amd64, i386 and sparc64 +.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386" && \ + ${TARGET_ARCH} != "sparc64" +OLD_FILES+=usr/sbin/sade +OLD_FILES+=usr/share/man/man8/sade.8.gz +.endif # 20080706: bsdlabel(8) removed on powerpc .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=sbin/bsdlabel ==== //depot/projects/mpsafetty/etc/ppp/ppp.conf#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # See /usr/share/examples/ppp/ for some examples # -# $FreeBSD: src/etc/ppp/ppp.conf,v 1.10 2004/11/19 17:12:56 obrien Exp $ +# $FreeBSD: src/etc/ppp/ppp.conf,v 1.11 2008/07/19 20:00:18 marcel Exp $ ################################################################# default: @@ -13,9 +13,9 @@ ident user-ppp VERSION (built COMPILATIONDATE) # Ensure that "device" references the correct serial port - # for your modem. (cuad0 = COM1, cuad1 = COM2) + # for your modem. (cuau0 = COM1, cuau1 = COM2) # - set device /dev/cuad1 + set device /dev/cuau1 set speed 115200 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \ ==== //depot/projects/mpsafetty/etc/rc.d/bluetooth#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/bluetooth,v 1.3 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/bluetooth,v 1.4 2008/07/19 20:11:33 marcel Exp $ # PROVIDE: bluetooth # REQUIRE: DAEMON @@ -234,19 +234,19 @@ # Try to figure out device type by looking at device name case "${dev}" in - # sioX - serial/UART Bluetooth device - sio*) + # uartX - serial/UART Bluetooth device + uart*) load_kld ng_h4 || return 1 hook="hook" # Obtain unit number from device. - unit=`expr ${dev} : 'sio\([0-9]\{1,\}\)'` + unit=`expr ${dev} : 'uart\([0-9]\{1,\}\)'` if [ -z "${unit}" ]; then - err 1 "Unable to get sio unit number: ${dev}" + err 1 "Unable to get uart unit number: ${dev}" fi - ${hcseriald} -f /dev/cuad${unit} -n ${dev} + ${hcseriald} -f /dev/cuau${unit} -n ${dev} sleep 1 # wait a little bit if [ ! -f "/var/run/hcseriald.${dev}.pid" ]; then @@ -326,8 +326,8 @@ # Try to figure out device type by looking at device name case "${dev}" in - # sioX - serial/UART Bluetooth device - sio*) + # uartX - serial/UART Bluetooth device + uart*) if [ -f "/var/run/hcseriald.${dev}.pid" ]; then kill `cat /var/run/hcseriald.${dev}.pid` sleep 1 # wait a little bit ==== //depot/projects/mpsafetty/etc/rc.d/serial#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.25 2006/03/23 08:48:38 ru Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.26 2008/07/19 20:12:02 marcel Exp $ # # PROVIDE: serial @@ -151,12 +151,12 @@ # $1 is the device identifier, and the remainder of the line # lists the device numbers. -# Initialize assorted 8250-16550 (sio) ports. -# maybe d 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v -# mouse d 2 -# modem d 1 -# terminal d 0 -# 3wire d 0 +# Initialize assorted 8250-16550 (uart) ports. +# maybe u 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v +# mouse u 2 +# modem u 1 +# terminal u 0 +# 3wire u 0 # Initialize all ports on a Cyclades-8yo. # modem c 00 01 02 03 04 05 06 07 ==== //depot/projects/mpsafetty/etc/rc.suspend#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.suspend,v 1.7 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/rc.suspend,v 1.8 2008/07/19 20:12:33 marcel Exp $ # # sample run command file for APM Suspend Event @@ -45,7 +45,7 @@ # If you have troubles on suspending with PC-CARD modem, try this. # See also contrib/pccardq.c (Only for PAO users). -# pccardq | awk -F '~' '$5 == "filled" && $4 ~ /sio/ \ +# pccardq | awk -F '~' '$5 == "filled" && $4 ~ /uart/ \ # { printf("pccardc power %d 0", $1); }' | sh # If a device driver has problems suspending, try unloading it before ==== //depot/projects/mpsafetty/etc/remote#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.16 2004/10/13 08:32:34 phk Exp $ +# $FreeBSD: src/etc/remote,v 1.17 2008/07/19 19:08:22 marcel Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,17 +52,17 @@ dial14400|14400 Baud Hayes attributes:\ br#57600:tc=dial: dial|Generic dialing parameters:\ - :dv=/dev/cuad0:cu=/dev/cuad0:at=hayes:du:pa=none: + :dv=/dev/cuau0:cu=/dev/cuau0:at=hayes:du:pa=none: # Hardwired line -cuad0c|cua0c:dv=/dev/cuad0:br#9600:pa=none: +cuau0c|cua0c:dv=/dev/cuau0:br#9600:pa=none: # Finger friendly shortcuts -sio0|com1:dv=/dev/cuad0:br#9600:pa=none: -sio1|com2:dv=/dev/cuad1:br#9600:pa=none: -sio2|com3:dv=/dev/cuad2:br#9600:pa=none: -sio3|com4:dv=/dev/cuad3:br#9600:pa=none: -sio4|com5:dv=/dev/cuad4:br#9600:pa=none: -sio5|com6:dv=/dev/cuad5:br#9600:pa=none: -sio6|com7:dv=/dev/cuad6:br#9600:pa=none: -sio7|com8:dv=/dev/cuad7:br#9600:pa=none: +uart0|sio0|com1:dv=/dev/cuau0:br#9600:pa=none: +uart1|sio1|com2:dv=/dev/cuau1:br#9600:pa=none: +uart2|sio2|com3:dv=/dev/cuau2:br#9600:pa=none: +uart3|sio3|com4:dv=/dev/cuau3:br#9600:pa=none: +uart4|sio4|com5:dv=/dev/cuau4:br#9600:pa=none: +uart5|sio5|com6:dv=/dev/cuau5:br#9600:pa=none: +uart6|sio6|com7:dv=/dev/cuau6:br#9600:pa=none: +uart7|sio7|com8:dv=/dev/cuau7:br#9600:pa=none: ==== //depot/projects/mpsafetty/share/man/man8/rc.subr.8#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.20 2008/03/31 14:11:37 skv Exp $ +.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.21 2008/07/20 10:06:14 lme Exp $ .\" .Dd May 18, 2007 .Dt RC.SUBR 8 @@ -288,7 +288,7 @@ .Dq Li ": ERROR: " , and then .Ar message . -.It Ic force_depend name +.It Ic force_depend Ar name Output an advisory message and force the .Ar name service to start. ==== //depot/projects/mpsafetty/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.50 2008/07/10 16:03:24 obrien Exp $ +# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ .include <bsd.own.mk> @@ -8,13 +8,13 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu isa kern libkern modules net net80211 netatalk \ +CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ + geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ - pci rpc security sys ufs vm ${CSCOPE_ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) -CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips powerpc sparc64 +CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .else CSCOPE_ARCHDIR ?= ${MACHINE} .endif ==== //depot/projects/mpsafetty/sys/amd64/include/param.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.21 2008/03/27 05:03:24 jb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.22 2008/07/19 23:42:38 alc Exp $ */ /* @@ -136,7 +136,7 @@ * the kern.maxbcache /boot/loader.conf variable. */ #ifndef VM_BCACHE_SIZE_MAX -#define VM_BCACHE_SIZE_MAX (400 * 1024 * 1024) +#define VM_BCACHE_SIZE_MAX (1024 * 1024 * 1024) #endif /* ==== //depot/projects/mpsafetty/sys/crypto/via/padlock.c#2 (text+ko) ==== @@ -25,14 +25,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.13 2007/07/03 12:13:43 gnn Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.14 2008/07/20 07:34:00 pjd Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/lock.h> -#include <sys/mutex.h> +#include <sys/rwlock.h> #include <sys/malloc.h> #include <sys/libkern.h> #if defined(__i386__) && !defined(PC98) @@ -60,7 +60,7 @@ int32_t sc_cid; uint32_t sc_sid; TAILQ_HEAD(, padlock_session) sc_sessions; - struct mtx sc_sessions_mtx; + struct rwlock sc_sessions_lock; }; static int padlock_newsession(device_t, uint32_t *sidp, struct cryptoini *cri); @@ -126,7 +126,7 @@ return (ENOMEM); } - mtx_init(&sc->sc_sessions_mtx, "padlock_mtx", NULL, MTX_DEF); + rw_init(&sc->sc_sessions_lock, "padlock_lock"); crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0); crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0); crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0); @@ -143,10 +143,10 @@ struct padlock_softc *sc = device_get_softc(dev); struct padlock_session *ses; - mtx_lock(&sc->sc_sessions_mtx); + rw_wlock(&sc->sc_sessions_lock); TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { if (ses->ses_used) { - mtx_unlock(&sc->sc_sessions_mtx); + rw_wunlock(&sc->sc_sessions_lock); device_printf(dev, "Cannot detach, sessions still active.\n"); return (EBUSY); @@ -157,7 +157,7 @@ TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); free(ses, M_PADLOCK); } - mtx_destroy(&sc->sc_sessions_mtx); + rw_destroy(&sc->sc_sessions_lock); crypto_unregister_all(sc->sc_cid); return (0); } @@ -208,7 +208,7 @@ /* * Let's look for a free session structure. */ - mtx_lock(&sc->sc_sessions_mtx); + rw_wlock(&sc->sc_sessions_lock); /* * Free sessions goes first, so if first session is used, we need to * allocate one. @@ -221,16 +221,16 @@ ses->ses_used = 1; TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); } - mtx_unlock(&sc->sc_sessions_mtx); + rw_wunlock(&sc->sc_sessions_lock); if (ses == NULL) { ses = malloc(sizeof(*ses), M_PADLOCK, M_NOWAIT | M_ZERO); if (ses == NULL) return (ENOMEM); ses->ses_used = 1; - mtx_lock(&sc->sc_sessions_mtx); + rw_wlock(&sc->sc_sessions_lock); ses->ses_id = sc->sc_sid++; TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); - mtx_unlock(&sc->sc_sessions_mtx); + rw_wunlock(&sc->sc_sessions_lock); } error = padlock_cipher_setup(ses, encini); @@ -258,21 +258,21 @@ struct padlock_session *ses; uint32_t sid = ((uint32_t)tid) & 0xffffffff; - mtx_lock(&sc->sc_sessions_mtx); + rw_wlock(&sc->sc_sessions_lock); TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { if (ses->ses_id == sid) break; } if (ses == NULL) { - mtx_unlock(&sc->sc_sessions_mtx); + rw_wunlock(&sc->sc_sessions_lock); return (EINVAL); } TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); padlock_hash_free(ses); bzero(ses, sizeof(*ses)); ses->ses_used = 0; - TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); - mtx_unlock(&sc->sc_sessions_mtx); + TAILQ_INSERT_HEAD(&sc->sc_sessions, ses, ses_next); + rw_wunlock(&sc->sc_sessions_lock); return (0); } @@ -322,12 +322,12 @@ goto out; } - mtx_lock(&sc->sc_sessions_mtx); + rw_rlock(&sc->sc_sessions_lock); TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { if (ses->ses_id == (crp->crp_sid & 0xffffffff)) break; } - mtx_unlock(&sc->sc_sessions_mtx); + rw_runlock(&sc->sc_sessions_lock); if (ses == NULL) { error = EINVAL; goto out; ==== //depot/projects/mpsafetty/sys/kern/subr_autoconf.c#3 (text+ko) ==== @@ -35,12 +35,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.26 2008/07/19 12:12:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.27 2008/07/19 19:08:35 rwatson Exp $"); #include "opt_ddb.h" #include <sys/param.h> #include <sys/kernel.h> +#include <sys/linker.h> #include <sys/lock.h> #include <sys/mutex.h> #include <sys/systm.h> @@ -60,11 +61,36 @@ /* ARGSUSED */ static void run_interrupt_driven_config_hooks(void *dummy); +/* + * If we wait too long for an interrupt-driven config hook to return, print + * a diagnostic. + */ +#define WARNING_INTERVAL_SECS 60 +static void +run_interrupt_driven_config_hooks_warning(int warned) +{ + struct intr_config_hook *hook_entry; + char namebuf[64]; + long offset; + + printf("run_interrupt_driven_hooks: still waiting after %d seconds " + "for", warned * WARNING_INTERVAL_SECS); + TAILQ_FOREACH(hook_entry, &intr_config_hook_list, ich_links) { + if (linker_search_symbol_name((caddr_t)hook_entry->ich_func, + namebuf, sizeof(namebuf), &offset) == 0) + printf(" %s", namebuf); + else + printf(" %p", hook_entry->ich_func); + } + printf("\n"); +} + static void run_interrupt_driven_config_hooks(dummy) void *dummy; { struct intr_config_hook *hook_entry, *next_entry; + int warned; mtx_lock(&intr_config_hook_lock); TAILQ_FOREACH_SAFE(hook_entry, &intr_config_hook_list, ich_links, @@ -74,9 +100,16 @@ mtx_lock(&intr_config_hook_lock); } + warned = 0; while (!TAILQ_EMPTY(&intr_config_hook_list)) { - msleep(&intr_config_hook_list, &intr_config_hook_lock, PCONFIG, - "conifhk", 0); + if (msleep(&intr_config_hook_list, &intr_config_hook_lock, + PCONFIG, "conifhk", WARNING_INTERVAL_SECS * hz) == + EWOULDBLOCK && warned < 5) { + mtx_unlock(&intr_config_hook_lock); + warned++; + run_interrupt_driven_config_hooks_warning(warned); + mtx_lock(&intr_config_hook_lock); + } } mtx_unlock(&intr_config_hook_lock); } @@ -135,7 +168,6 @@ #ifdef DDB #include <ddb/ddb.h> -#include <sys/linker.h> DB_SHOW_COMMAND(conifhk, db_show_conifhk) { ==== //depot/projects/mpsafetty/sys/kern/vfs_bio.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.542 2008/03/28 12:30:11 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.543 2008/07/20 04:13:51 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -481,19 +481,6 @@ nbuf = maxbuf; } -#if 0 - /* - * Do not allow the buffer_map to be more then 1/2 the size of the - * kernel_map. - */ - if (nbuf > (kernel_map->max_offset - kernel_map->min_offset) / - (BKVASIZE * 2)) { - nbuf = (kernel_map->max_offset - kernel_map->min_offset) / - (BKVASIZE * 2); - printf("Warning: nbufs capped at %d\n", nbuf); - } -#endif - /* * swbufs are used as temporary holders for I/O, such as paging I/O. * We have no less then 16 and no more then 256. ==== //depot/projects/mpsafetty/sys/netinet/toedev.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/toedev.h,v 1.4 2007/12/16 05:30:21 kmacy Exp $ + * $FreeBSD: src/sys/netinet/toedev.h,v 1.5 2008/07/20 02:02:50 kmacy Exp $ */ #ifndef _NETINET_TOEDEV_H_ @@ -78,15 +78,35 @@ struct ifnet *tod_lldev; /* first interface */ const struct tom_info *tod_offload_mod; /* TCP offload module */ - int (*tod_open)(struct toedev *dev); - int (*tod_close)(struct toedev *dev); + /* + * This TOE device is capable of offloading the connection for socket so + */ int (*tod_can_offload)(struct toedev *dev, struct socket *so); + + /* + * Establish a connection to nam using the TOE device dev + */ int (*tod_connect)(struct toedev *dev, struct socket *so, struct rtentry *rt, struct sockaddr *nam); + /* + * Send an mbuf down to the toe device + */ int (*tod_send)(struct toedev *dev, struct mbuf *m); + /* + * Receive an array of mbufs from the TOE device dev + */ int (*tod_recv)(struct toedev *dev, struct mbuf **m, int n); + /* + * Device specific ioctl interface + */ int (*tod_ctl)(struct toedev *dev, unsigned int req, void *data); + /* + * Update L2 entry in toedev + */ void (*tod_arp_update)(struct toedev *dev, struct rtentry *neigh); + /* + * Failover from one toe device to another + */ void (*tod_failover)(struct toedev *dev, struct ifnet *bond_ifp, struct ifnet *ndev, int event); void *tod_priv; /* driver private data */ ==== //depot/projects/mpsafetty/sys/sys/vmmeter.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vmmeter.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/vmmeter.h,v 1.34 2007/09/25 06:25:06 alc Exp $ + * $FreeBSD: src/sys/sys/vmmeter.h,v 1.35 2008/07/19 22:35:13 alc Exp $ */ #ifndef _SYS_VMMETER_H_ @@ -89,7 +89,7 @@ u_int v_active_count; /* (q) pages active */ u_int v_inactive_target; /* (c) pages desired inactive */ u_int v_inactive_count; /* (q) pages inactive */ - u_int v_cache_count; /* (f) pages on buffer cache queue */ + u_int v_cache_count; /* (f) pages on cache queue */ u_int v_cache_min; /* (c) min pages desired on cache queue */ u_int v_cache_max; /* (c) max pages in cached obj */ u_int v_pageout_free_min; /* (c) min pages reserved for kernel */ @@ -112,17 +112,6 @@ extern struct vmmeter cnt; /* - * Return TRUE if we are under our reserved low-free-pages threshold - */ - -static __inline -int -vm_page_count_reserved(void) -{ - return (cnt.v_free_reserved > (cnt.v_free_count + cnt.v_cache_count)); -} - -/* * Return TRUE if we are under our severe low-free-pages threshold * * This routine is typically used at the user<->system interface to determine ==== //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.342 2008/05/24 00:41:32 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.343 2008/07/19 22:29:44 pjd Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -1303,7 +1303,6 @@ struct vnode *vp; struct cdev *dev; int error; - struct thread *td; error = vfs_hash_get(mp, ino, flags, curthread, vpp, NULL, NULL); if (error || *vpp != NULL) @@ -1368,7 +1367,6 @@ } #endif - td = curthread; lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); error = insmntque(vp, mp); if (error != 0) { @@ -1376,7 +1374,7 @@ *vpp = NULL; return (error); } - error = vfs_hash_insert(vp, ino, flags, td, vpp, NULL, NULL); + error = vfs_hash_insert(vp, ino, flags, curthread, vpp, NULL, NULL); if (error || *vpp != NULL) return (error); ==== //depot/projects/mpsafetty/usr.sbin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.388 2008/07/04 18:15:36 jhb Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.389 2008/07/19 18:21:52 marcel Exp $ .include <bsd.own.mk> @@ -154,7 +154,7 @@ ${_rtsold} \ rwhod \ sa \ - sade \ + ${_sade} \ ${_sendmail} \ setfib \ setfmac \ @@ -309,6 +309,7 @@ _mptable= mptable _ndiscvt= ndiscvt _pnpinfo= pnpinfo +_sade= sade _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -341,6 +342,7 @@ _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt +_sade= sade _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -364,6 +366,7 @@ .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump +_sade= sade .endif .include <bsd.subdir.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807201216.m6KCG0OY083867>