diff options
Diffstat (limited to 'arch/x86/boot/compressed/misc_32.c')
| -rw-r--r-- | arch/x86/boot/compressed/misc_32.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c index a1979e322ef0..52fc214546e9 100644 --- a/arch/x86/boot/compressed/misc_32.c +++ b/arch/x86/boot/compressed/misc_32.c @@ -1,7 +1,7 @@ /* * misc.c - * - * This is a collection of several routines from gzip-1.0.3 + * + * This is a collection of several routines from gzip-1.0.3 * adapted for Linux. * * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 @@ -9,6 +9,11 @@ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */ +/* + * we have to be careful, because no indirections are allowed here, and + * paravirt_ops is a kind of one. As it will only run in baremetal anyway, + * we just keep it from happening + */ #undef CONFIG_PARAVIRT #include <linux/linkage.h> #include <linux/vmalloc.h> @@ -261,7 +266,7 @@ static void putstr(const char *s) y--; } } else { - vidmem [ ( x + cols * y ) * 2 ] = c; + vidmem [(x + cols * y) * 2] = c; if ( ++x >= cols ) { x = 0; if ( ++y >= lines ) { @@ -345,7 +350,8 @@ static void error(char *x) } asmlinkage void decompress_kernel(void *rmode, unsigned long end, - uch *input_data, unsigned long input_len, uch *output) + uch *input_data, unsigned long input_len, + uch *output) { real_mode = rmode; @@ -360,10 +366,10 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end, lines = RM_SCREEN_INFO.orig_video_lines; cols = RM_SCREEN_INFO.orig_video_cols; - window = output; /* Output buffer (Normally at 1M) */ - free_mem_ptr = end; /* Heap */ + window = output; /* Output buffer (Normally at 1M) */ + free_mem_ptr = end; /* Heap */ free_mem_end_ptr = end + HEAP_SIZE; - inbuf = input_data; /* Input buffer */ + inbuf = input_data; /* Input buffer */ insize = input_len; inptr = 0; |