Module Name: src
Committed By: mrg
Date: Tue May 17 05:32:31 UTC 2011
Modified Files:
src/sys/conf: files
src/sys/uvm: files.uvm
Log Message:
fix the ordering and make UVMHIST enable KERNHIST automatically.
To generate a diff of this commit:
cvs rdiff -u -r1.1012 -r1.1013 src/sys/conf/files
cvs rdiff -u -r1.19 -r1.20 src/sys/uvm/files.uvm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1012 src/sys/conf/files:1.1013
--- src/sys/conf/files:1.1012 Tue May 17 04:18:06 2011
+++ src/sys/conf/files Tue May 17 05:32:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1012 2011/05/17 04:18:06 mrg Exp $
+# $NetBSD: files,v 1.1013 2011/05/17 05:32:31 mrg Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1379,18 +1379,17 @@
include "ufs/files.ufs"
#
-# UVM (virtual memory)
-#
-include "uvm/files.uvm"
-
-#
# Kernel history/tracing. Old UVMHIST depends upon this.
-# XXXMRG can't make UVMHIST depend properly on KERNHIST?
#
defflag opt_kernhist.h KERNHIST KERNHIST_PRINT
file kern/kern_history.c kernhist
#
+# UVM (virtual memory)
+#
+include "uvm/files.uvm"
+
+#
# Security models
#
include "secmodel/files.secmodel"
Index: src/sys/uvm/files.uvm
diff -u src/sys/uvm/files.uvm:1.19 src/sys/uvm/files.uvm:1.20
--- src/sys/uvm/files.uvm:1.19 Thu Dec 9 01:48:05 2010
+++ src/sys/uvm/files.uvm Tue May 17 05:32:31 2011
@@ -1,9 +1,9 @@
-# $NetBSD: files.uvm,v 1.19 2010/12/09 01:48:05 uebayasi Exp $
+# $NetBSD: files.uvm,v 1.20 2011/05/17 05:32:31 mrg Exp $
#
# UVM options
#
-defflag opt_uvmhist.h UVMHIST UVMHIST_PRINT
+defflag opt_uvmhist.h UVMHIST UVMHIST_PRINT: KERNHIST
defflag opt_uvm.h USE_TOPDOWN_VM UVMMAP_COUNTERS
defflag opt_vmswap.h VMSWAP
defflag opt_readahead.h READAHEAD_STATS
