From 9518889e98a19a45006be474bf326d12debdddcd Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 11 Apr 1997 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1997-04-11

---
 carrera/devrtc.c |  6 ++++++
 ip/udp.c         |  7 ++++++-
 port/taslock.c   | 10 ----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/carrera/devrtc.c b/carrera/devrtc.c
index 3b54482a0c685a157a5956cf8b6193ad57a392eb..60666f648565988846c5a1f8a5b4783d739fa627 100644
--- a/carrera/devrtc.c
+++ b/carrera/devrtc.c
@@ -175,6 +175,7 @@ _rtctime(void)
 long
 rtctime(void)
 {
+#ifdef notdef
 	int i;
 	long t, ot;
 
@@ -191,6 +192,11 @@ rtctime(void)
 	iunlock(&rtclock);
 
 	return t;
+#else
+	extern ulong boottime;
+
+	return boottime+TK2SEC(MACHP(0)->ticks);
+#endif /* notdef */
 }
 
 static long	 
diff --git a/ip/udp.c b/ip/udp.c
index 13da4dfd51275c1f7e65b79e6e1acba263ce5bbd..9331ad8562b1451ee69da28243bdc1708adc3c99 100644
--- a/ip/udp.c
+++ b/ip/udp.c
@@ -81,8 +81,13 @@ udpstate(char **s, Conv *c)
 }
 
 static char*
-udpannounce(Conv *c, char**, int)
+udpannounce(Conv *c, char** argv, int argc)
 {
+	char *e;
+
+	e = Fsstdannounce(c, argv, argc);
+	if(e != nil)
+		return e;
 	Fsconnected(&fs, c, nil);
 
 	return nil;
diff --git a/port/taslock.c b/port/taslock.c
index c44327f0173e47222e6af7d2cb415a63f6d01413..31051540ded092f3aaa4ff22f2c5a5aacaffaec6 100644
--- a/port/taslock.c
+++ b/port/taslock.c
@@ -69,18 +69,8 @@ ilock(Lock *l)
 	}
 
 	for(;;){
-#ifdef notdef
 		while(l->key)
 			;
-#else
-{   int i;
-    i = 0;
-    while(l->key){
-	if(i++ > 100000000)
-	    panic("ilock loop: caller pc %luX, held by %luX\n", pc, l->pc);
-    }
-}
-#endif /* notdef */
 		if(tas(&l->key) == 0){
 			l->sr = x;
 			l->pc = pc;