git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
sh
/
boot
/
compressed
/
misc.c
diff --git
a/arch/sh/boot/compressed/misc.c
b/arch/sh/boot/compressed/misc.c
index
211e911
..
df65e30
100644
(file)
--- a/
arch/sh/boot/compressed/misc.c
+++ b/
arch/sh/boot/compressed/misc.c
@@
-11,8
+11,9
@@
* Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000
*/
* Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000
*/
-#include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
+#include <asm/addrspace.h>
+#include <asm/page.h>
#ifdef CONFIG_SH_STANDARD_BIOS
#include <asm/sh_bios.h>
#endif
#ifdef CONFIG_SH_STANDARD_BIOS
#include <asm/sh_bios.h>
#endif
@@
-229,7
+230,7
@@
long* stack_start = &user_stack[STACK_SIZE];
void decompress_kernel(void)
{
output_data = 0;
void decompress_kernel(void)
{
output_data = 0;
- output_ptr =
(unsigned long)&_text+0x20001000
;
+ output_ptr =
P2SEGADDR((unsigned long)&_text+PAGE_SIZE)
;
free_mem_ptr = (unsigned long)&_end;
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
free_mem_ptr = (unsigned long)&_end;
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;