Minor - remove permanent_halt function.

The only caller is now in the 0xf0000 segment - so no need for it.

diff --git a/src/romlayout.S b/src/romlayout.S
index 4e3cdab4275d8943a95e1f036b50d18d62a0f354..96aa836c9c5cd326041dd3ba7f2555204f0d02af 100644 (file)
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -403,16 +403,6 @@ post32:
 
         .code16gcc
 
-// Shutdown a CPU.  We want this in the 0xf000 section to ensure that
-// the code wont be overwritten with something else.  (Should
-// something spurious wake up the CPU, we want to be sure that the hlt
-// insn will still be present and will shutdown the CPU.)
-        DECLFUNC permanent_halt
-permanent_halt:
-        cli
-1:      hlt
-        jmp 1b
-
         // IRQ trampolines
         .macro IRQ_TRAMPOLINE num
         DECLFUNC irq_trampoline_0x\num

diff --git a/src/smpdetect.c b/src/smpdetect.c
index 0617be45747eff7cbb6bf0a834cbfb7ab87fbd6a..c54ec578dc84dd6b04d426989ed5f189fcea2cc4 100644 (file)
--- a/src/smpdetect.c
+++ b/src/smpdetect.c
@@ -56,7 +56,8 @@ ASM16(
     "  movw %ax, %ds\n"
     "  lock incl smp_cpus\n"
     // Halt the processor.
-    "  jmp permanent_halt\n"
+    "1:hlt\n"
+    "  jmp 1b\n"
     );
 
 /* find the number of CPUs by launching a SIPI to them */