summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/init/bootblock_normal.c3
-rw-r--r--src/arch/x86/init/bootblock_simple.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c
index 218d456ad3..bde2535ba6 100644
--- a/src/arch/x86/init/bootblock_normal.c
+++ b/src/arch/x86/init/bootblock_normal.c
@@ -1,6 +1,7 @@
#include <smp/node.h>
#include <bootblock_common.h>
#include <pc80/mc146818rtc.h>
+#include <halt.h>
static const char *get_fallback(const char *stagelist) {
while (*stagelist) stagelist++;
@@ -47,5 +48,5 @@ static void main(unsigned long bist)
if (entry) call(entry, bist);
/* duh. we're stuck */
- asm volatile ("1:\n\thlt\n\tjmp 1b\n\t");
+ halt();
}
diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c
index 179595a727..adeecf7ba6 100644
--- a/src/arch/x86/init/bootblock_simple.c
+++ b/src/arch/x86/init/bootblock_simple.c
@@ -1,5 +1,6 @@
#include <smp/node.h>
#include <bootblock_common.h>
+#include <halt.h>
static void main(unsigned long bist)
{
@@ -18,5 +19,5 @@ static void main(unsigned long bist)
unsigned long entry;
entry = findstage(target1);
if (entry) call(entry, bist);
- asm volatile ("1:\n\thlt\n\tjmp 1b\n\t");
+ halt();
}