From f0dff967936bdcf7f900834b0d836aa6025067d8 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 24 May 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-05-24

---
 carrera/devether.c | 5 ++++-
 carrera/l.s        | 2 +-
 carrera/mem.h      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/carrera/devether.c b/carrera/devether.c
index 778739305dfaf053310fffed5f960d79c01b7d27..8d5fcb178dee1d877467fd95bf689f4d3a8282b4 100644
--- a/carrera/devether.c
+++ b/carrera/devether.c
@@ -570,7 +570,10 @@ initbufs(Ether *c)
 	int i;
 	uchar *mem, *base;
 
-	mem = xspanalloc(64*1024, 8, 64*1024);
+	/* Put the ethernet buffers in the same place
+	 * as the bootrom
+	 */
+	mem = (void*)(KZERO|0x2000);
 	base = mem;
 	mem = CACHELINE(uchar, mem);
 
diff --git a/carrera/l.s b/carrera/l.s
index eb7c65273a3bfac9b97f1bc4f4e554e7520a3960..617a8125f369ad281ec68d3869bb04c86419c0d7 100644
--- a/carrera/l.s
+++ b/carrera/l.s
@@ -29,7 +29,7 @@ TEXT	start(SB), $-4
 
 DBG(0x55aa0000)
 	MOVW	$setR30(SB), R30
-	MOVW	$(BEV|DE|CU1|INTR7|INTR6|INTR5|INTR4|INTR3|INTR2|INTR1|INTR0), R1
+	MOVW	$(CU1|INTR7|INTR6|INTR5|INTR4|INTR3|INTR2|INTR1|INTR0), R1
 	MOVW	R1, M(STATUS)
 	WAIT
 DBG(0x55aa0001)
diff --git a/carrera/mem.h b/carrera/mem.h
index d8a273b15e0c28ae5f729d5e28aa7cf98a4bf88e..b5b062b4c672e6aee21e420720958bcf82206555 100644
--- a/carrera/mem.h
+++ b/carrera/mem.h
@@ -162,7 +162,7 @@
 #define	TSTKTOP	(0xC0000000+USTKSIZE-BY2PG) /* top of temporary stack */
 #define	TSTKSIZ 100
 #define	KZERO	KSEG0			/* base of kernel address space */
-#define	KTZERO	(KZERO+0x2000)		/* first address in kernel text */
+#define	KTZERO	(KZERO+0x12000)		/* first address in kernel text */
 #define	USTKSIZE	(4*1024*1024)	/* size of user stack */
 #define globalmem(x)	(((ulong)x)&KZERO)	/* addresses valid in all contexts */
 /*