PERFORCE change 48180 for review
Robert Watson
rwatson at FreeBSD.org
Thu Mar 4 21:12:00 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=48180
Change 48180 by rwatson at rwatson_tislabs on 2004/03/04 21:11:49
Integrate the netperf_socket branch to pick up the VM
contiguous allocation bug fix from alc.
Affected files ...
.. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/netperf_socket/sys/conf/options.amd64#3 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_contig.c#4 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/amd64/conf/NOTES#3 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.6 2004/03/05 05:08:22 obrien Exp $
#
# We don't have modules on amd64.
@@ -503,10 +503,6 @@
options FB_INSTALL_CDEV # install a CDEV entry in /dev
-# PECOFF module (Win32 Execution Format)
-options PECOFF_SUPPORT
-options PECOFF_DEBUG
-
options ENABLE_ALART
options KBDIO_DEBUG=2
options KBD_MAXRETRY=4
==== //depot/projects/netperf_socket/sys/conf/options.amd64#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.11 2004/03/03 09:35:47 obrien Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.12 2004/03/05 04:38:58 obrien Exp $
# Options specific to AMD64 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
@@ -15,8 +15,6 @@
COMPAT_SVR4 opt_dontuse.h
DEBUG_SVR4 opt_svr4.h
NDISAPI opt_dontuse.h
-PECOFF_DEBUG opt_pecoff.h
-PECOFF_SUPPORT opt_dontuse.h
# Change KVM size. Changes things all over the kernel.
KVA_PAGES opt_global.h
==== //depot/projects/netperf_socket/sys/vm/vm_contig.c#4 (text+ko) ====
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.31 2004/03/02 08:25:58 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.32 2004/03/05 04:46:32 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -232,9 +232,7 @@
mtx_lock_spin(&vm_page_queue_free_mtx);
for (i = start; i < (start + size / PAGE_SIZE); i++) {
pqtype = pga[i].queue - pga[i].pc;
- if ((VM_PAGE_TO_PHYS(&pga[i]) !=
- (VM_PAGE_TO_PHYS(&pga[i - 1]) + PAGE_SIZE)) ||
- (pqtype != PQ_FREE)) {
+ if (pqtype != PQ_FREE) {
start++;
goto again;
}
More information about the p4-projects
mailing list