From b816e838ee6bad70393336a55836d2ce0251abf5 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 3 Jul 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-07-03

---
 port/devbit.c | 2 +-
 port/proc.c   | 4 ++--
 power/devhs.c | 4 ++--
 ss/screen.c   | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/port/devbit.c b/port/devbit.c
index ec4df26a80dc1a935f1a1777336a5b6f688de2e6..df7c14113c81772a76acfb78e1307b8a4ff819ec 100644
--- a/port/devbit.c
+++ b/port/devbit.c
@@ -1429,6 +1429,7 @@ bitalloc(Rectangle rect, int ld)
 	*a->wfree++ = nw;
 	*a->wfree++ = (ulong)a;
 	*a->wfree++ = (ulong)b;
+	memset(a->wfree, 0, (nw-HDR)*sizeof(ulong));
 	b->base = a->wfree;
 	a->wfree += nw;
 	a->nbusy++;
@@ -1628,7 +1629,6 @@ bitcompact(void)
 			na++;
 		}
 		a->wfree = p1;
-		memset(p1, 0, ((a->words+a->nwords)-p1)*sizeof(ulong));
 	}
 	for(a=bit.arena; a<ea; a++)
 		if(a->words && a->nbusy==0)
diff --git a/port/proc.c b/port/proc.c
index 8efa069caac363fed780638ba88306646690bb81..aa5742cab3fc249e17163f0d69180242fe916916 100644
--- a/port/proc.c
+++ b/port/proc.c
@@ -678,11 +678,11 @@ kproc(char *name, void (*func)(void *), void *arg)
 	Proc *p;
 	int n;
 	ulong upa;
-	int lastvar;	/* used to compute stack address */
 	User *up;
 	KMap *k;
 	static Pgrp *kpgrp;
 	char *user;
+	int lastvar;	/* used to compute stack address */
 
 	/*
 	 * Kernel stack
@@ -733,7 +733,7 @@ kproc(char *name, void (*func)(void *), void *arg)
 
 	if(u->p->user[0] != '\0')
 		user = u->p->user;
-	sprint(p->text, "%s.%.6s", name, user);
+	strcpy(p->text, name);
 
 	p->nchild = 0;
 	p->parent = 0;
diff --git a/power/devhs.c b/power/devhs.c
index 27b724c09804f820ecd233210048bbc398653eea..40be8fe06ace3731f6edc76455e499db99b24be4 100644
--- a/power/devhs.c
+++ b/power/devhs.c
@@ -544,11 +544,11 @@ hskproc(void *arg)
 
 		/*
 		 *  Sleep if input fifo empty. Make sure we don't hold onto
-		 *  any byte for more tha 1/10 second.
+		 *  any byte for more than 1/10 second.
 		 */
 		if(!(addr->csr & REF)){
 			if(hp->wptr == hp->buf)
-				sleep(&hp->kr, notempty, addr);
+				tsleep(&hp->kr, notempty, addr, 2000);
 			else
 				tsleep(&hp->kr, notempty, addr, 100);
 		}
diff --git a/ss/screen.c b/ss/screen.c
index 3ba6aacd87ca3b226262afacd8bbf2b5f1df1c8f..7cf8b37d49b90c9ad9fa82c55e0786090a46354d 100644
--- a/ss/screen.c
+++ b/ss/screen.c
@@ -342,11 +342,13 @@ kbdstate(IOQ *q, int c)
 void
 buzz(int freq, int dur)
 {
+	USED(freq, dur);
 }
 
 void
 lights(int mask)
 {
+	USED(mask);
 }
 
 int