aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/compressed/misc_32.c
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2008-01-30 07:33:38 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:38 -0500
commit818a08f8a5681d54532af8263099bb5561afa0c1 (patch)
treef5ed907c36e0eb05be5c8982c44400e951f51550 /arch/x86/boot/compressed/misc_32.c
parent6b3c0426a765dcae277ce9eb06d865a2f109cf48 (diff)
x86: unify whitespace and comments in arch/x86/boot/compressed/misc_??.c
size reports no change in arch/x86/boot/compressed/vmlinux. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/boot/compressed/misc_32.c')
-rw-r--r--arch/x86/boot/compressed/misc_32.c20
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 a1979e322ef..52fc214546e 100644
--- a/arch/x86/boot/compressed/misc_32.c
+++ b/arch/x86/boot/compressed/misc_32.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * misc.c 2 * misc.c
3 * 3 *
4 * This is a collection of several routines from gzip-1.0.3 4 * This is a collection of several routines from gzip-1.0.3
5 * adapted for Linux. 5 * adapted for Linux.
6 * 6 *
7 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 7 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
@@ -9,6 +9,11 @@
9 * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 9 * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
10 */ 10 */
11 11
12/*
13 * we have to be careful, because no indirections are allowed here, and
14 * paravirt_ops is a kind of one. As it will only run in baremetal anyway,
15 * we just keep it from happening
16 */
12#undef CONFIG_PARAVIRT 17#undef CONFIG_PARAVIRT
13#include <linux/linkage.h> 18#include <linux/linkage.h>
14#include <linux/vmalloc.h> 19#include <linux/vmalloc.h>
@@ -261,7 +266,7 @@ static void putstr(const char *s)
261 y--; 266 y--;
262 } 267 }
263 } else { 268 } else {
264 vidmem [ ( x + cols * y ) * 2 ] = c; 269 vidmem [(x + cols * y) * 2] = c;
265 if ( ++x >= cols ) { 270 if ( ++x >= cols ) {
266 x = 0; 271 x = 0;
267 if ( ++y >= lines ) { 272 if ( ++y >= lines ) {
@@ -345,7 +350,8 @@ static void error(char *x)
345} 350}
346 351
347asmlinkage void decompress_kernel(void *rmode, unsigned long end, 352asmlinkage void decompress_kernel(void *rmode, unsigned long end,
348 uch *input_data, unsigned long input_len, uch *output) 353 uch *input_data, unsigned long input_len,
354 uch *output)
349{ 355{
350 real_mode = rmode; 356 real_mode = rmode;
351 357
@@ -360,10 +366,10 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,
360 lines = RM_SCREEN_INFO.orig_video_lines; 366 lines = RM_SCREEN_INFO.orig_video_lines;
361 cols = RM_SCREEN_INFO.orig_video_cols; 367 cols = RM_SCREEN_INFO.orig_video_cols;
362 368
363 window = output; /* Output buffer (Normally at 1M) */ 369 window = output; /* Output buffer (Normally at 1M) */
364 free_mem_ptr = end; /* Heap */ 370 free_mem_ptr = end; /* Heap */
365 free_mem_end_ptr = end + HEAP_SIZE; 371 free_mem_end_ptr = end + HEAP_SIZE;
366 inbuf = input_data; /* Input buffer */ 372 inbuf = input_data; /* Input buffer */
367 insize = input_len; 373 insize = input_len;
368 inptr = 0; 374 inptr = 0;
369 375