diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2009-02-07 13:25:25 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2009-02-07 13:25:25 -0500 |
| commit | 60b69990a521993a901abc07b17f5135c2a5ecb5 (patch) | |
| tree | a52308415282838caa3a90c8eb11bef8f1a97fe3 /src | |
| parent | a3b612ef3ccac08da026f1fc79b0fa6fe646df23 (diff) | |
| download | seabios-hppa-60b69990a521993a901abc07b17f5135c2a5ecb5.zip seabios-hppa-60b69990a521993a901abc07b17f5135c2a5ecb5.tar.gz seabios-hppa-60b69990a521993a901abc07b17f5135c2a5ecb5.tar.bz2 | |
Minor - remove permanent_halt function.
The only caller is now in the 0xf0000 segment - so no need for it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/romlayout.S | 10 | ||||
| -rw-r--r-- | src/smpdetect.c | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/romlayout.S b/src/romlayout.S index 4e3cdab..96aa836 100644 --- 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 0617be4..c54ec57 100644 --- 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 */ |