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

---
 ip/il.c    | 4 ++--
 pc/i8259.c | 6 ++----
 pc/mp.c    | 9 ++++++++-
 pc/mp.h    | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ip/il.c b/ip/il.c
index a8a9264cc1f14b633b1c7ab2d89aea27a1a16b85..aab05e33b3aead38f57cd73a2df8418bb6fd7a52 100644
--- a/ip/il.c
+++ b/ip/il.c
@@ -155,10 +155,10 @@ ilconnect(Conv *c, char **argv, int argc)
 {
 	char *e;
 
-	e = ilstart(c, IL_CONNECT, 20);
+	e = Fsstdconnect(c, argv, argc);
 	if(e != nil)
 		return e;
-	return Fsstdconnect(c, argv, argc);
+	return ilstart(c, IL_CONNECT, 20);
 }
 
 int
diff --git a/pc/i8259.c b/pc/i8259.c
index 509451ca81bbbc7f5e60c123ff5b1721fd42d7c9..f9f6c086d2597b1aeaf5f5d7bfc15e75d290d048 100644
--- a/pc/i8259.c
+++ b/pc/i8259.c
@@ -91,10 +91,8 @@ i8259init(void)
 			elcr = (inb(Elcr2)<<8)|elcr1;
 	}
 	outb(Elcr1, elcr1);
-	/*
-	if(elcr)
-		print("ELCR: %4.4uX\n", elcr);
-	 */
+//	if(elcr)
+//		print("ELCR: %4.4uX\n", elcr);
 }
 
 int
diff --git a/pc/mp.c b/pc/mp.c
index fe2cbbe9e1eb1052f49a3b78cc3277ac7ae118d4..d0498ec3b5584cc0950ab989b526a90854eb55ef 100644
--- a/pc/mp.c
+++ b/pc/mp.c
@@ -359,8 +359,15 @@ mpstartap(Apic* apic)
 
 	nvramwrite(0x0F, 0x0A);
 	lapicstartap(apic, PADDR(APBOOTSTRAP));
-	for(i = 0; i < 100000 && (active.machs & (1<<machno)) == 0; i++)
+	for(i = 0; i < 100000; i++){
+		lock(&mprdthilock);
+		if(mprdthi & ((1<<apic->apicno)<<24)){
+			unlock(&mprdthilock);
+			break;
+		}
+		unlock(&mprdthilock);
 		microdelay(10);
+	}
 	nvramwrite(0x0F, 0x00);
 }
 
diff --git a/pc/mp.h b/pc/mp.h
index 15b75a0bf10fcb6ab4653d1f2c6046542620dcf0..f387548ffcef9e60881d68a3d5b3a2d9cf2de69e 100644
--- a/pc/mp.h
+++ b/pc/mp.h
@@ -168,7 +168,7 @@ typedef struct Apic {
 } Apic;
 
 enum {
-	MaxAPICNO	= 7,
+	MaxAPICNO	= 31,
 };
 
 enum {					/* I/O APIC registers */