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/2d8f46ba7cce
branches:  chs-ubc2
changeset: 471351:2d8f46ba7cce
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jul 02 00:30:19 1999 +0000

description:
Fix merge botch.

diffstat:

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

diffs (18 lines):

diff -r 1d0d2d08e073 -r 2d8f46ba7cce sys/uvm/uvm.h
--- a/sys/uvm/uvm.h     Fri Jul 02 00:24:41 1999 +0000
+++ b/sys/uvm/uvm.h     Fri Jul 02 00:30:19 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm.h,v 1.15.4.2 1999/07/01 23:55:13 thorpej Exp $     */
+/*     $NetBSD: uvm.h,v 1.15.4.3 1999/07/02 00:30:19 thorpej Exp $     */
 
 /*
  *
@@ -163,8 +163,6 @@
  * macros
  */
 
-#ifdef _KERNEL
-
 /*
  * UVM_UNLOCK_AND_WAIT: atomic unlock+wait... front end for the 
  * (poorly named) thread_sleep_msg function.



Home | Main Index | Thread Index | Old Index