projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s390/boot: rename HEAP_SIZE due to name collision
[linux-2.6-microblaze.git]
/
arch
/
s390
/
boot
/
compressed
/
decompressor.c
diff --git
a/arch/s390/boot/compressed/decompressor.c
b/arch/s390/boot/compressed/decompressor.c
index
4504663
..
368fd37
100644
(file)
--- a/
arch/s390/boot/compressed/decompressor.c
+++ b/
arch/s390/boot/compressed/decompressor.c
@@
-30,13
+30,13
@@
extern unsigned char _compressed_start[];
extern unsigned char _compressed_end[];
#ifdef CONFIG_HAVE_KERNEL_BZIP2
extern unsigned char _compressed_end[];
#ifdef CONFIG_HAVE_KERNEL_BZIP2
-#define
HEAP_SIZE
0x400000
+#define
BOOT_HEAP_SIZE
0x400000
#else
#else
-#define
HEAP_SIZE
0x10000
+#define
BOOT_HEAP_SIZE
0x10000
#endif
static unsigned long free_mem_ptr = (unsigned long) _end;
#endif
static unsigned long free_mem_ptr = (unsigned long) _end;
-static unsigned long free_mem_end_ptr = (unsigned long) _end + HEAP_SIZE;
+static unsigned long free_mem_end_ptr = (unsigned long) _end +
BOOT_
HEAP_SIZE;
#ifdef CONFIG_KERNEL_GZIP
#include "../../../../lib/decompress_inflate.c"
#ifdef CONFIG_KERNEL_GZIP
#include "../../../../lib/decompress_inflate.c"
@@
-62,7
+62,7
@@
static unsigned long free_mem_end_ptr = (unsigned long) _end + HEAP_SIZE;
#include "../../../../lib/decompress_unxz.c"
#endif
#include "../../../../lib/decompress_unxz.c"
#endif
-#define decompress_offset ALIGN((unsigned long)_end + HEAP_SIZE, PAGE_SIZE)
+#define decompress_offset ALIGN((unsigned long)_end +
BOOT_
HEAP_SIZE, PAGE_SIZE)
unsigned long mem_safe_offset(void)
{
unsigned long mem_safe_offset(void)
{