Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/chs-ubc2]: src/sys/uvm Fix merge botch.



details:   https://anonhg.NetBSD.org/src/rev/48b73a6faaec
branches:  chs-ubc2
changeset: 471349:48b73a6faaec
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jul 02 00:15:23 1999 +0000

description:
Fix merge botch.

diffstat:

 sys/uvm/uvm_vnode.h |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 93f3f14f6609 -r 48b73a6faaec sys/uvm/uvm_vnode.h
--- a/sys/uvm/uvm_vnode.h       Thu Jul 01 22:58:14 1999 +0000
+++ b/sys/uvm/uvm_vnode.h       Fri Jul 02 00:15:23 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_vnode.h,v 1.7.4.2 1999/07/01 23:55:18 thorpej Exp $        */
+/*     $NetBSD: uvm_vnode.h,v 1.7.4.3 1999/07/02 00:15:23 thorpej Exp $        */
 
 /*
  *
@@ -93,6 +93,7 @@
                                           i/o sync to clear so it can do
                                           i/o */
 #define UVM_VNODE_WRITEABLE    0x200   /* uvn has pages that are writeable */
+#endif /* UBC */
 
 /*
  * UVM_VNODE_BLOCKED: any condition that should new processes from



Home | Main Index | Thread Index | Old Index