From owner-p4-projects@FreeBSD.ORG Mon Aug 21 10:25:44 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 D154816A4E1; Mon, 21 Aug 2006 10:25:44 +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 92DF916A4DA for ; Mon, 21 Aug 2006 10:25:44 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8297E43D64 for ; Mon, 21 Aug 2006 10:25:41 +0000 (GMT) (envelope-from ryanb@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 k7LAPfLT069130 for ; Mon, 21 Aug 2006 10:25:41 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7LAPfeM069126 for perforce@freebsd.org; Mon, 21 Aug 2006 10:25:41 GMT (envelope-from ryanb@FreeBSD.org) Date: Mon, 21 Aug 2006 10:25:41 GMT Message-Id: <200608211025.k7LAPfeM069126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 104675 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: Mon, 21 Aug 2006 10:25:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=104675 Change 104675 by ryanb@ryanb_yuki on 2006/08/21 10:25:01 Final IFC before generating SoC diff. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/sysctl.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_object.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_page.c#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_ioctl.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.17 2006/08/04 20:14:03 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.18 2006/08/21 00:46:10 mjacob Exp $ */ /*- * * Copyright (c) 1997-2006 by Matthew Jacob @@ -61,9 +61,6 @@ #define ISP_ROLE_TARGET 0x1 #define ISP_ROLE_INITIATOR 0x2 #define ISP_ROLE_BOTH (ISP_ROLE_TARGET|ISP_ROLE_INITIATOR) -#ifndef ISP_DEFAULT_ROLES -#define ISP_DEFAULT_ROLES ISP_ROLE_BOTH -#endif /* * Get the current adapter role ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_pci.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.119 2006/08/14 05:36:26 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.120 2006/08/21 00:46:10 mjacob Exp $"); #include #include @@ -509,6 +509,12 @@ } } #endif + bitmap = 0; + if (getenv_int("role", &bitmap)) { + isp->isp_role = bitmap; + } else { + isp->isp_role = ISP_DEFAULT_ROLES; + } } static void ==== //depot/projects/soc2006/rbeasley_sound/sys/sys/sysctl.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.143 2006/08/12 23:33:10 obrien Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.144 2006/08/21 06:27:27 alc Exp $ */ #ifndef _SYS_SYSCTL_H_ @@ -616,6 +616,8 @@ SYSCTL_DECL(_kern_ipc); SYSCTL_DECL(_sysctl); SYSCTL_DECL(_vm); +SYSCTL_DECL(_vm_stats); +SYSCTL_DECL(_vm_stats_misc); SYSCTL_DECL(_vfs); SYSCTL_DECL(_net); SYSCTL_DECL(_debug); ==== //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_object.c#3 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.366 2006/08/13 00:11:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.367 2006/08/21 06:27:28 alc Exp $"); #include #include @@ -144,7 +144,6 @@ struct vm_object kernel_object_store; struct vm_object kmem_object_store; -SYSCTL_DECL(_vm_stats); SYSCTL_NODE(_vm_stats, OID_AUTO, object, CTLFLAG_RD, 0, "VM object stats"); static long object_collapses; ==== //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_page.c#5 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.325 2006/08/13 00:11:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.326 2006/08/21 00:34:31 alc Exp $"); #include #include @@ -1131,14 +1131,6 @@ } panic("vm_page_free: freeing wired page"); } - - /* - * Clear the UNMANAGED flag when freeing an unmanaged page. - */ - if (m->flags & PG_UNMANAGED) { - m->flags &= ~PG_UNMANAGED; - } - if (m->hold_count != 0) { m->flags &= ~PG_ZERO; VM_PAGE_SETQUEUE2(m, PQ_HOLD); ==== //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_pageq.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.27 2006/06/23 16:44:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.28 2006/08/21 06:27:28 alc Exp $"); #include "opt_vmpage.h" @@ -59,7 +59,6 @@ static int pq_cachesize = 0; /* size of the cache in KB */ static int pq_cachenways = 0; /* associativity of the cache */ -SYSCTL_DECL(_vm_stats); SYSCTL_NODE(_vm_stats, OID_AUTO, pagequeue, CTLFLAG_RW, 0, "VM meter stats"); SYSCTL_INT(_vm_stats_pagequeue, OID_AUTO, page_colors, CTLFLAG_RD, &(PQ_NUMCOLORS), 0, "Number of colors in the page queue"); ==== //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_zeroidle.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.37 2006/04/17 18:20:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.39 2006/08/21 06:27:28 alc Exp $"); #include @@ -52,8 +52,6 @@ #include #include -SYSCTL_DECL(_vm_stats_misc); - static int cnt_prezero; SYSCTL_INT(_vm_stats_misc, OID_AUTO, cnt_prezero, CTLFLAG_RD, &cnt_prezero, 0, ""); @@ -99,7 +97,7 @@ return (1); } -static int +static void vm_page_zero_idle(void) { static int free_rover; @@ -122,7 +120,6 @@ } free_rover = (free_rover + PQ_PRIME2) & PQ_COLORMASK; mtx_unlock_spin(&vm_page_queue_free_mtx); - return (1); } /* Called by vm_page_free to hint that a new page is available. */