patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / x86_64 / boot / compressed / misc.c

diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86_64/boot/compressed/misc.c
index 78d4c78..c8b9216 100644 (file)
--- a/arch/x86_64/boot/compressed/misc.c
+++ b/arch/x86_64/boot/compressed/misc.c
@@ -92,7 +92,7 @@ static unsigned long output_ptr = 0;
 static void *malloc(int size);
 static void free(void *where);
  
-static void puts(const char *);
+static void putstr(const char *);
   
 extern int end;
 static long free_mem_ptr = (long)&end;
@@ -153,7 +153,7 @@ static void scroll(void)
                vidmem[i] = ' ';
 }
 
-static void puts(const char *s)
+static void putstr(const char *s)
 {
        int x,y,pos;
        char c;
@@ -270,9 +270,9 @@ static void flush_window(void)
 
 static void error(char *x)
 {
-       puts("\n\n");
-       puts(x);
-       puts("\n\n -- System halted");
+       putstr("\n\n");
+       putstr(x);
+       putstr("\n\n -- System halted");
 
        while(1);
 }
@@ -346,9 +346,9 @@ int decompress_kernel(struct moveparams *mv, void *rmode)
        else setup_output_buffer_if_we_run_high(mv);
 
        makecrc();
-       puts(".\nDecompressing Linux...");
+       putstr(".\nDecompressing Linux...");
        gunzip();
-       puts("done.\nBooting the kernel.\n");
+       putstr("done.\nBooting the kernel.\n");
        if (high_loaded) close_output_buffer_if_we_run_high(mv);
        return high_loaded;
 }