diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /arch/s390/boot/compressed | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/s390/boot/compressed')
| -rw-r--r-- | arch/s390/boot/compressed/misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c index a97d69525829..14e0479d3888 100644 --- a/arch/s390/boot/compressed/misc.c +++ b/arch/s390/boot/compressed/misc.c | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | /* Symbols defined by linker scripts */ | 24 | /* Symbols defined by linker scripts */ |
| 25 | extern char input_data[]; | 25 | extern char input_data[]; |
| 26 | extern int input_len; | 26 | extern int input_len; |
| 27 | extern int _text; | 27 | extern char _text, _end; |
| 28 | extern int _end; | 28 | extern char _bss, _ebss; |
| 29 | 29 | ||
| 30 | static void error(char *m); | 30 | static void error(char *m); |
| 31 | 31 | ||
| @@ -129,12 +129,12 @@ unsigned long decompress_kernel(void) | |||
| 129 | unsigned long output_addr; | 129 | unsigned long output_addr; |
| 130 | unsigned char *output; | 130 | unsigned char *output; |
| 131 | 131 | ||
| 132 | check_ipl_parmblock((void *) 0, (unsigned long) output + SZ__bss_start); | ||
| 133 | memset(&_bss, 0, &_ebss - &_bss); | ||
| 132 | free_mem_ptr = (unsigned long)&_end; | 134 | free_mem_ptr = (unsigned long)&_end; |
| 133 | free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; | 135 | free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; |
| 134 | output = (unsigned char *) ((free_mem_end_ptr + 4095UL) & -4096UL); | 136 | output = (unsigned char *) ((free_mem_end_ptr + 4095UL) & -4096UL); |
| 135 | 137 | ||
| 136 | check_ipl_parmblock((void *) 0, (unsigned long) output + SZ__bss_start); | ||
| 137 | |||
| 138 | #ifdef CONFIG_BLK_DEV_INITRD | 138 | #ifdef CONFIG_BLK_DEV_INITRD |
| 139 | /* | 139 | /* |
| 140 | * Move the initrd right behind the end of the decompressed | 140 | * Move the initrd right behind the end of the decompressed |