Module Name:    src
Committed By:   rmind
Date:           Sun Jun 12 03:50:42 UTC 2011

Modified Files:
        src/doc: BRANCHES CHANGES

Log Message:
Note rmind-uvmplock branch merge.


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/doc/BRANCHES
cvs rdiff -u -r1.1555 -r1.1556 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/BRANCHES
diff -u src/doc/BRANCHES:1.308 src/doc/BRANCHES:1.309
--- src/doc/BRANCHES:1.308	Thu Jun  2 22:15:22 2011
+++ src/doc/BRANCHES	Sun Jun 12 03:50:42 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.308 2011/06/02 22:15:22 cherry Exp $
+#	$NetBSD: BRANCHES,v 1.309 2011/06/12 03:50:42 rmind Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -495,29 +495,6 @@
 		allowing multiple conflicting packages and versions to co-exist
 		within the same tree
 
-Branch:		rmind-uvmplock
-Description:	Reorganize locking in UVM and improve x86 pmap(9)
-Status:		Active
-Start Date:	15 March 2010
-End Date:	
-Base Tag:	rmind-uvmplock-base
-Maintainer:	Mindaugas Rasiukevicius <rm...@netbsd.org>
-Scope:		Kernel
-Notes:		Goals:
-
-		- Reorganize locking in UVM and serialize pmap(9) operations
-		  on same page(s).  New lock order: [vmpage-lock] -> pmap-lock.
-		  Based on the patch from ad@.
-		- Simplify locking in pmap(9) modules by removing P->V locking.
-		- Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock)
-		  to share locks among UVM objects where necessary.
-		- Rewrite and optimize x86 TLB shootdown code.
-		- Unify /dev/mem et al in MI code and provide required locking.
-
-		Future work:
-
-		- Optimize pmap_remove() with tracking in struct vm_map_entry.
-
 Branch:		rpaulo-netinet-merge-pcb
 Description:	merge in6pcb with inpcb
 Status:		Dormant
@@ -1079,6 +1056,29 @@
 Notes:		Only the first item in the description was finished
 		in this branch.
 
+Branch:		rmind-uvmplock
+Description:	Reorganize locking in UVM and improve x86 pmap(9)
+Status:		Terminated; merged to -current
+Start Date:	15 March 2010
+End Date:	12 June 2011
+Base Tag:	rmind-uvmplock-base
+Maintainer:	Mindaugas Rasiukevicius <rm...@netbsd.org>
+Scope:		Kernel
+Notes:		Goals:
+
+		- Reorganize locking in UVM and serialize pmap(9) operations
+		  on same page(s).  New lock order: [vmpage-lock] -> pmap-lock.
+		  Based on the patch from ad@.
+		- Simplify locking in pmap(9) modules by removing P->V locking.
+		- Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock)
+		  to share locks among UVM objects where necessary.
+		- Rewrite and optimize x86 TLB shootdown code.
+		- Unify /dev/mem et al in MI code and provide required locking.
+
+		Future work:
+
+		- Optimize pmap_remove() with tracking in struct vm_map_entry.
+
 Branch:		sommerfeld_i386mp_1
 Description:	Multiprocessor support for i386 using Intel MP BIOS.
 Status:		Terminated; merged to -current

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1555 src/doc/CHANGES:1.1556
--- src/doc/CHANGES:1.1555	Sun Jun 12 01:45:00 2011
+++ src/doc/CHANGES	Sun Jun 12 03:50:42 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1555 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1556 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -1021,3 +1021,4 @@
 		after exec(3). [alnsn 20110601]
 	alpha: Converted Alpha to use PCU to manage FPU. [matt 20110607]
 	sparc: enable options MODULAR in the GENERIC* kernels.  [mrg 20110611]
+	kernel: Merge of the rmind-uvmplock branch. [rmind 20110612]

Reply via email to