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

---
 boot/local.c      | 2 --
 boot/userpasswd.c | 1 -
 pc/l.s            | 2 +-
 port/devip.c      | 1 +
 ss/l.s            | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/boot/local.c b/boot/local.c
index 8f9a2627a3cef001290259bd16f98cc84def18d8..79fb25f2c987271a8cb0f51ef9cdf2cbe86935dc 100644
--- a/boot/local.c
+++ b/boot/local.c
@@ -20,12 +20,10 @@ authlocal(void)
 int
 connectlocal(void)
 {
-	ulong i;
 	int p[2];
 	char d[DIRLEN];
 	char sbuf[32];
 	char rbuf[32];
-	char *mtpt;
 	char partition[2*NAMELEN];
 
 	if(stat("/kfs", d) < 0)
diff --git a/boot/userpasswd.c b/boot/userpasswd.c
index 181d948bc50bdcc0561ea6860ea4ce7972b1694c..75a5a0e5200809cd0c6633213c4c88af0882b214 100644
--- a/boot/userpasswd.c
+++ b/boot/userpasswd.c
@@ -17,7 +17,6 @@ userpasswd(int islocal, Method *mp)
 	char key[7];
 	char buf[8 + NAMELEN];
 	int fd, crfd;
-	char *p;
 
 	if(*username == 0 || strcmp(username, "none") == 0){
 		strcpy(username, "none");
diff --git a/pc/l.s b/pc/l.s
index 9534569f0b1625fa2e450f6b743495414458cbe4..2343c7a46d791d9eb2a780b6046d631d00909d4f 100644
--- a/pc/l.s
+++ b/pc/l.s
@@ -306,7 +306,7 @@ TEXT	fpinit(SB),$0		/* turn on & init the floating point */
 	FPON
 	FINIT
 	WAIT
-	PUSHW	$0x0330
+	PUSHW	$0x033E
 	FLDCW	0(SP)		/* ignore underflow/precision, signal others */
 	POPW	AX
 	WAIT
diff --git a/port/devip.c b/port/devip.c
index e616750400b22496a0fde0096a4314967d328744..5426bea9952b2d65ecc69390bb260e1035df0243 100644
--- a/port/devip.c
+++ b/port/devip.c
@@ -215,6 +215,7 @@ ipincoming(Ipifc *ifc, Ipconv *from)
 	qlock(new);
 	*p = new;
 	qunlock(ifc);
+	poperror();
 	if(from)	/* copy ownership from listening channel */
 		netown(new, from->owner, 0);
 	else		/* current user becomes owner */
diff --git a/ss/l.s b/ss/l.s
index 7b4e534b89c57e48dff47615326bbef27391cf3e..36e696ebd3fd16a8134954bf54938dad7dac8a6c 100644
--- a/ss/l.s
+++ b/ss/l.s
@@ -1,7 +1,7 @@
 #include "mem.h"
 
 #define	SYSPSR	(SPL(0x0)|PSREF|PSRSUPER|0)
-#define	NOOP	OR R0, R0; OR R0, R0; OR R0, R0
+#define	NOOP	ORN R0, R0; ORN R0, R0; ORN R0, R0
 
 TEXT	start(SB), $-4