From 069e7b44b7ac2ea0656a7f1a581af79de9034504 Mon Sep 17 00:00:00 2001
From: Ali Mashtizadeh <mashti@cs.stanford.edu>
Date: Fri, 13 Nov 2015 14:41:35 -0800
Subject: [PATCH] Fix debugger's CPU halting

---
 sys/amd64/debug.c | 4 ++++
 sys/amd64/mp.c    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/sys/amd64/debug.c b/sys/amd64/debug.c
index 28cb1e0..f98b795 100644
--- a/sys/amd64/debug.c
+++ b/sys/amd64/debug.c
@@ -24,6 +24,10 @@ void
 Debug_HaltCPUs()
 {
     debugCmd = 0;
+
+    if (MP_GetCPUs() == 1)
+	return;
+
     LAPIC_BroadcastNMI(T_DEBUGIPI);
 
     // Wait for processors to enter
diff --git a/sys/amd64/mp.c b/sys/amd64/mp.c
index d7e6bf2..ebd0197 100644
--- a/sys/amd64/mp.c
+++ b/sys/amd64/mp.c
@@ -112,6 +112,7 @@ MP_Init()
 
 	lastCPU = i;
     }
+    lastCPU++;
 }
 
 void