[src/trunk]: src/doc Note rmind-uvmplock branch merge.

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c47b2698fd81
branches:  trunk
changeset: 765958:c47b2698fd81
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Jun 12 03:50:42 2011 +0000

description:
Note rmind-uvmplock branch merge.

diffstat:

 doc/BRANCHES |  48 ++++++++++++++++++++++++------------------------
 doc/CHANGES  |   3 ++-
 2 files changed, 26 insertions(+), 25 deletions(-)

diffs (83 lines):

diff -r 5308768f466b -r c47b2698fd81 doc/BRANCHES
--- a/doc/BRANCHES      Sun Jun 12 03:42:41 2011 +0000
+++ b/doc/BRANCHES      Sun Jun 12 03:50:42 2011 +0000
@@ -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 <rmind%netbsd.org@localhost>
-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 <rmind%netbsd.org@localhost>
+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
diff -r 5308768f466b -r c47b2698fd81 doc/CHANGES
--- a/doc/CHANGES       Sun Jun 12 03:42:41 2011 +0000
+++ b/doc/CHANGES       Sun Jun 12 03:50:42 2011 +0000
@@ -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]