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>
This commit is contained in:
parent
6b3c0426a7
commit
818a08f8a5
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* misc.c
|
* 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.
|
* adapted for Linux.
|
||||||
*
|
*
|
||||||
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
||||||
|
@ -9,6 +9,11 @@
|
||||||
* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
|
* 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
|
#undef CONFIG_PARAVIRT
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
|
@ -261,7 +266,7 @@ static void putstr(const char *s)
|
||||||
y--;
|
y--;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
vidmem [ ( x + cols * y ) * 2 ] = c;
|
vidmem [(x + cols * y) * 2] = c;
|
||||||
if ( ++x >= cols ) {
|
if ( ++x >= cols ) {
|
||||||
x = 0;
|
x = 0;
|
||||||
if ( ++y >= lines ) {
|
if ( ++y >= lines ) {
|
||||||
|
@ -345,7 +350,8 @@ static void error(char *x)
|
||||||
}
|
}
|
||||||
|
|
||||||
asmlinkage void decompress_kernel(void *rmode, unsigned long end,
|
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;
|
real_mode = rmode;
|
||||||
|
|
||||||
|
@ -360,10 +366,10 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,
|
||||||
lines = RM_SCREEN_INFO.orig_video_lines;
|
lines = RM_SCREEN_INFO.orig_video_lines;
|
||||||
cols = RM_SCREEN_INFO.orig_video_cols;
|
cols = RM_SCREEN_INFO.orig_video_cols;
|
||||||
|
|
||||||
window = output; /* Output buffer (Normally at 1M) */
|
window = output; /* Output buffer (Normally at 1M) */
|
||||||
free_mem_ptr = end; /* Heap */
|
free_mem_ptr = end; /* Heap */
|
||||||
free_mem_end_ptr = end + HEAP_SIZE;
|
free_mem_end_ptr = end + HEAP_SIZE;
|
||||||
inbuf = input_data; /* Input buffer */
|
inbuf = input_data; /* Input buffer */
|
||||||
insize = input_len;
|
insize = input_len;
|
||||||
inptr = 0;
|
inptr = 0;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* misc.c
|
* 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.
|
* adapted for Linux.
|
||||||
*
|
*
|
||||||
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
||||||
|
@ -260,7 +260,7 @@ static void putstr(const char *s)
|
||||||
y--;
|
y--;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
vidmem [ ( x + cols * y ) * 2 ] = c;
|
vidmem [(x + cols * y) * 2] = c;
|
||||||
if ( ++x >= cols ) {
|
if ( ++x >= cols ) {
|
||||||
x = 0;
|
x = 0;
|
||||||
if ( ++y >= lines ) {
|
if ( ++y >= lines ) {
|
||||||
|
@ -344,7 +344,8 @@ static void error(char *x)
|
||||||
}
|
}
|
||||||
|
|
||||||
asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
|
asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
|
||||||
uch *input_data, unsigned long input_len, uch *output)
|
uch *input_data, unsigned long input_len,
|
||||||
|
uch *output)
|
||||||
{
|
{
|
||||||
real_mode = rmode;
|
real_mode = rmode;
|
||||||
|
|
||||||
|
@ -359,8 +360,8 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
|
||||||
lines = RM_SCREEN_INFO.orig_video_lines;
|
lines = RM_SCREEN_INFO.orig_video_lines;
|
||||||
cols = RM_SCREEN_INFO.orig_video_cols;
|
cols = RM_SCREEN_INFO.orig_video_cols;
|
||||||
|
|
||||||
window = output; /* Output buffer (Normally at 1M) */
|
window = output; /* Output buffer (Normally at 1M) */
|
||||||
free_mem_ptr = heap; /* Heap */
|
free_mem_ptr = heap; /* Heap */
|
||||||
free_mem_end_ptr = heap + HEAP_SIZE;
|
free_mem_end_ptr = heap + HEAP_SIZE;
|
||||||
inbuf = input_data; /* Input buffer */
|
inbuf = input_data; /* Input buffer */
|
||||||
insize = input_len;
|
insize = input_len;
|
||||||
|
|
Loading…
Reference in New Issue