From 09d129d4d5c99e12e13f58821c50480684a02a44 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 19 Feb 1993 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1993-02-19

---
 pc/devfloppy.c | 1 -
 pc/trap.c      | 2 +-
 port/devboot.c | 1 -
 power/l.s      | 9 ++++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pc/devfloppy.c b/pc/devfloppy.c
index d3dc12f5f09679e7a61d49df70b9e4e46bb9f558..de0a03208ae37e0ee5210f7428f3e48d2b4535e6 100644
--- a/pc/devfloppy.c
+++ b/pc/devfloppy.c
@@ -616,7 +616,6 @@ floppyon(Drive *dp)
 		tsleep(&dp->r, return0, 0, 750);
 
 		/* clear any pending interrupts */
-		setvec(Floppyvec, floppyintr);
 		floppysense();
 	}
 
diff --git a/pc/trap.c b/pc/trap.c
index 2ee04ab13e57c19ee9a9dbade9ecb1b670459abb..a662f393c11f45d76d402f80731e843d5a82cc70 100644
--- a/pc/trap.c
+++ b/pc/trap.c
@@ -241,9 +241,9 @@ trap(Ureg *ur)
 	 */
 	c = v&~0x7;
 	if(c==Int0vec || c==Int1vec){
-		outb(Int0ctl, EOI);
 		if(c == Int1vec)
 			outb(Int1ctl, EOI);
+		outb(Int0ctl, EOI);
 		if(v != Uart0vec)
 			uartintr0(ur);
 	}
diff --git a/port/devboot.c b/port/devboot.c
index 9af499b0a6e8991965649bea9a68c696ae600bad..e13656e8c705bf1a4af8a3a043edf7fdfa03da7b 100644
--- a/port/devboot.c
+++ b/port/devboot.c
@@ -114,7 +114,6 @@ bootwrite(Chan *c, void *buf, long n, ulong offset)
 	case Qboot:
 		pc = *(ulong*)buf;
 		splhi();
-		icflush(0, 64*1024);
 		gotopc(pc);
 	}
 	error(Ebadarg);
diff --git a/power/l.s b/power/l.s
index cb21aa9f08dc3e002c564c12ae9ba53bd7c74d19..e4551fb7b34e16341234a60fc97ac743dd09adf5 100644
--- a/power/l.s
+++ b/power/l.s
@@ -181,7 +181,14 @@ TEXT	getcallerpc(SB), $0
 	MOVW	0(SP), R1
 	RET
 
-TEXT	gotopc(SB), $-4
+TEXT	gotopc(SB), $8
+
+	MOVW	R1, 0(FP)
+	MOVW	$(64*1024), R1
+	MOVW	R1, 8(SP)
+	MOVW	R0, R1
+	JAL	icflush(SB)
+	MOVW	0(FP), R1
 
 	MOVW	_argc(SB), R4
 	MOVW	_argv(SB), R5