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

---
 carrera/clock.c  |  4 ++--
 carrera/fns.h    |  2 +-
 carrera/fptrap.c | 10 +++++-----
 carrera/main.c   |  2 +-
 carrera/trap.c   |  2 ++
 port/pgrp.c      | 12 +++++-------
 port/portfns.h   |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/carrera/clock.c b/carrera/clock.c
index 5909f64defd47308c434bc8f73a7a066e076baa2..eca2692b58fa8e383fbd0d815b369971b05adbaa 100644
--- a/carrera/clock.c
+++ b/carrera/clock.c
@@ -54,9 +54,9 @@ clock(Ureg *ur)
 		m->proc->pc = ur->pc;
 
 	accounttime();
-
+/*
 	ifjab();
-
+*/
 	kproftimer(ur->pc);
 
 	kmapinval();
diff --git a/carrera/fns.h b/carrera/fns.h
index 165637fab035ec6ac7df05b3215411bb5d959f64..556fbc2b7738ef5cb471e474e52d72d3a7c4d99e 100644
--- a/carrera/fns.h
+++ b/carrera/fns.h
@@ -84,7 +84,7 @@ void*		pxspanalloc(ulong, int, ulong);
 void		rdbginit(void);
 ulong		rdcount(void);
 int		readlog(ulong, char*, ulong);
-long*		reg(Ureg*, int);
+ulong*		reg(Ureg*, int);
 void		restfpregs(FPsave*, ulong);
 void		screeninit(void);
 void		screenputs(char*, int);
diff --git a/carrera/fptrap.c b/carrera/fptrap.c
index 1ea725a50768283abfdab495ee9e312860ada0e6..78e748adc682f591d458f37947cebd79a7e7a9e6 100644
--- a/carrera/fptrap.c
+++ b/carrera/fptrap.c
@@ -174,19 +174,19 @@ fpunimp(ulong iw)
 	return 0;
 }
 
-long*
+ulong*
 reg(Ureg *ur, int regno)
 {
 	/* regs go from R31 down in ureg, R29 is missing */
 	switch(regno) {
 	case 31:
-		return &ur->r31;
+		return (ulong*)&ur->r31;
 	case 30:
-		return &ur->r30;
+		return (ulong*)&ur->r30;
 	case 29:
-		return &ur->sp;
+		return (ulong*)&ur->sp;
 	}
-	return (&ur->r28) + (28-regno)*(&ur->r27-&ur->r28);
+	return (ulong*)((&ur->r28) + (28-regno)*(&ur->r27-&ur->r28));
 }
 
 static ulong
diff --git a/carrera/main.c b/carrera/main.c
index 1e6817944d5a34b13055750c3db95847ce5c888f..d046b50f120d8f0da22560437299377c505a7f77 100644
--- a/carrera/main.c
+++ b/carrera/main.c
@@ -402,7 +402,7 @@ userinit(void)
 }
 
 void
-exit(long type)
+exit(int type)
 {
 	uchar *vec;
 
diff --git a/carrera/trap.c b/carrera/trap.c
index 8369bfb74488148f39dd66b4d3f8df14a486b959..eff3ac0ce67ca9d27f82cdaf743cc841e7f44825 100644
--- a/carrera/trap.c
+++ b/carrera/trap.c
@@ -335,9 +335,11 @@ intr(Ureg *ur)
 		case 0x24:		/* Serial 2 */
 			ns16552intr(1);
 			break;
+/*
 		case 0x10:
 			fiberint(0);
 			break;
+ */
 		case 0x14:
 			etherintr();
 			break;
diff --git a/port/pgrp.c b/port/pgrp.c
index 6343b8de6788c007230c5ac54b29d085defbe96f..dddb2bb38585c9aecad890b09106a6667f260d66 100644
--- a/port/pgrp.c
+++ b/port/pgrp.c
@@ -93,24 +93,22 @@ closepgrp(Pgrp *p)
 void
 pgrpinsert(Mount **order, Mount *m)
 {
-	Mount *f, **l;
+	Mount *f;
 
 	m->order = 0;
-	if(*order == nil) {
+	if(*order == 0) {
 		*order = m;
 		return;
 	}
-
-	l = order;
 	for(f = *order; f; f = f->order) {
 		if(m->mountid < f->mountid) {
 			m->order = f;
-			*l = f;
+			*order = m;
 			return;
 		}
-		l = &f->order;
+		order = &f->order;
 	}
-	*l = m->order;
+	*order = m;
 }
 
 /*
diff --git a/port/portfns.h b/port/portfns.h
index ebc052ef2f609e0f571a189309c1e99adf4050c5..2e80d3e3bcb4c0f2da701ff096276910e0b5bd69 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -309,4 +309,4 @@ void		hnputl(void*, ulong);
 void		hnputs(void*, ushort);
 ulong		nhgetl(void*);
 ushort		nhgets(void*);
-void		filsetalloc(void* (*)(long), void* (*)(long));
+void		filsetalloc(void* (*)(int), void* (*)(int));