summaryrefslogtreecommitdiff
path: root/arch/x86/boot/compressed/misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/boot/compressed/misc.c')
-rw-r--r--arch/x86/boot/compressed/misc.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 8f0253d8c7ff..9536d778149e 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -12,6 +12,7 @@
*/
#include "misc.h"
+#include "error.h"
#include "../string.h"
#include "../voffset.h"
@@ -36,7 +37,6 @@
#define memmove memmove
/* Functions used by the included decompressor code below. */
-static void error(char *m);
void *memmove(void *dest, const void *src, size_t n);
/*
@@ -169,22 +169,6 @@ void __puthex(unsigned long value)
}
}
-void warn(char *m)
-{
- error_putstr("\n\n");
- error_putstr(m);
- error_putstr("\n\n");
-}
-
-static void error(char *m)
-{
- warn(m);
- error_putstr(" -- System halted");
-
- while (1)
- asm("hlt");
-}
-
#if CONFIG_X86_NEED_RELOCS
static void handle_relocations(void *output, unsigned long output_len)
{