PERFORCE change 150223 for review

Ed Schouten ed at FreeBSD.org
Sun Sep 21 18:18:05 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=150223

Change 150223 by ed at ed_dull on 2008/09/21 18:18:01

	IFC the clist changes.

Affected files ...

.. //depot/projects/mpsafetty/ObsoleteFiles.inc#13 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_clist.c#6 integrate
.. //depot/projects/mpsafetty/sys/sys/clist.h#4 integrate
.. //depot/projects/mpsafetty/sys/sys/param.h#13 integrate
.. //depot/projects/mpsafetty/sys/vm/vm_pageout.c#3 integrate

Differences ...

==== //depot/projects/mpsafetty/ObsoleteFiles.inc#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.161 2008/09/17 15:49:44 attilio Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -15,7 +15,8 @@
 #
 
 # 20080917: removal of manpage for axed kernel primitive suser(9)
-OLD_FILES+=usr/share/man/man9/suser.9
+OLD_FILES+=usr/share/man/man9/suser.9.gz
+OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)

==== //depot/projects/mpsafetty/sys/kern/subr_clist.c#6 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_clist.c,v 1.47 2008/07/30 12:32:42 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_clist.c,v 1.48 2008/09/21 18:12:18 ed Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/mpsafetty/sys/sys/clist.h#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/sys/sys/clist.h,v 1.13 2008/05/23 18:34:33 ed Exp $
+ * $FreeBSD: src/sys/sys/clist.h,v 1.14 2008/09/21 18:12:18 ed Exp $
  */
 
 #ifndef _SYS_CLIST_H_

==== //depot/projects/mpsafetty/sys/sys/param.h#13 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.367 2008/09/17 15:50:41 attilio Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.368 2008/09/21 18:12:18 ed Exp $
  */
 
 #ifndef _SYS_PARAM_H_

==== //depot/projects/mpsafetty/sys/vm/vm_pageout.c#3 (text+ko) ====

@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.298 2008/08/03 14:26:15 trhodes Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.299 2008/09/21 18:01:34 alc Exp $");
 
 #include "opt_vm.h"
 #include <sys/param.h>
@@ -1280,7 +1280,8 @@
 	pcount = cnt.v_active_count;
 	fullintervalcount += vm_pageout_stats_interval;
 	if (fullintervalcount < vm_pageout_full_stats_interval) {
-		tpcount = (vm_pageout_stats_max * cnt.v_active_count) / cnt.v_page_count;
+		tpcount = (int64_t)vm_pageout_stats_max * cnt.v_active_count /
+		    cnt.v_page_count;
 		if (pcount > tpcount)
 			pcount = tpcount;
 	} else {


More information about the p4-projects mailing list