Commit ad924c8a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] gcc-3.5: misc.c warning fix

arch/i386/boot/compressed/misc.c:107: warning: conflicting types for built-in function 'puts'
parent 6428be3d
...@@ -104,7 +104,7 @@ static unsigned long output_ptr = 0; ...@@ -104,7 +104,7 @@ static unsigned long output_ptr = 0;
static void *malloc(int size); static void *malloc(int size);
static void free(void *where); static void free(void *where);
static void puts(const char *); static void putstr(const char *);
extern int end; extern int end;
static long free_mem_ptr = (long)&end; static long free_mem_ptr = (long)&end;
...@@ -169,7 +169,7 @@ static void scroll(void) ...@@ -169,7 +169,7 @@ static void scroll(void)
vidmem[i] = ' '; vidmem[i] = ' ';
} }
static void puts(const char *s) static void putstr(const char *s)
{ {
int x,y,pos; int x,y,pos;
char c; char c;
...@@ -287,9 +287,9 @@ static void flush_window(void) ...@@ -287,9 +287,9 @@ static void flush_window(void)
static void error(char *x) static void error(char *x)
{ {
puts("\n\n"); putstr("\n\n");
puts(x); putstr(x);
puts("\n\n -- System halted"); putstr("\n\n -- System halted");
while(1); /* Halt */ while(1); /* Halt */
} }
...@@ -373,9 +373,9 @@ asmlinkage int decompress_kernel(struct moveparams *mv, void *rmode) ...@@ -373,9 +373,9 @@ asmlinkage int decompress_kernel(struct moveparams *mv, void *rmode)
else setup_output_buffer_if_we_run_high(mv); else setup_output_buffer_if_we_run_high(mv);
makecrc(); makecrc();
puts("Uncompressing Linux... "); putstr("Uncompressing Linux... ");
gunzip(); gunzip();
puts("Ok, booting the kernel.\n"); putstr("Ok, booting the kernel.\n");
if (high_loaded) close_output_buffer_if_we_run_high(mv); if (high_loaded) close_output_buffer_if_we_run_high(mv);
return high_loaded; return high_loaded;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment