Fix debugger's CPU halting

2015-11-13 14:41:35 -08:00 · 2015-11-13 14:41:35 -08:00 · 069e7b44b7
commit 069e7b44b7
parent 1fdc2fd933
2 changed files with 5 additions and 0 deletions
--- 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
--- a/sys/amd64/mp.c
+++ b/sys/amd64/mp.c
@ -112,6 +112,7 @@ MP_Init()

 	lastCPU = i;
    }
+    lastCPU++;
 }

 void