aboutsummaryrefslogtreecommitdiffstats
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.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index de1d54d8bddc..8c29f82b15e4 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -169,15 +169,11 @@ static void serial_putchar(int ch)
169 outb(ch, early_serial_base + TXR); 169 outb(ch, early_serial_base + TXR);
170} 170}
171 171
172void __putstr(int error, const char *s) 172void __putstr(const char *s)
173{ 173{
174 int x, y, pos; 174 int x, y, pos;
175 char c; 175 char c;
176 176
177#ifndef CONFIG_X86_VERBOSE_BOOTUP
178 if (!error)
179 return;
180#endif
181 if (early_serial_base) { 177 if (early_serial_base) {
182 const char *str = s; 178 const char *str = s;
183 while (*str) { 179 while (*str) {
@@ -223,12 +219,6 @@ void __putstr(int error, const char *s)
223 outb(0xff & (pos >> 1), vidport+1); 219 outb(0xff & (pos >> 1), vidport+1);
224} 220}
225 221
226static void debug_putstr(const char *s)
227{
228 if (debug)
229 putstr(s);
230}
231
232void *memset(void *s, int c, size_t n) 222void *memset(void *s, int c, size_t n)
233{ 223{
234 int i; 224 int i;