summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-08-02 18:23:39 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 13:00:30 +0200
commit403a1c4f1380b4ec842df5f4aa86e86ba02904f3 (patch)
tree237341d8b8bfe2a57628b167782ba9a74050e343 /arch/cris
parent345c52e079001354809c17f84e164827e99f2aaa (diff)
downloadlinux-403a1c4f1380b4ec842df5f4aa86e86ba02904f3.tar.gz
linux-403a1c4f1380b4ec842df5f4aa86e86ba02904f3.tar.bz2
linux-403a1c4f1380b4ec842df5f4aa86e86ba02904f3.zip
CRIS: v32: Correct address for romfs in the image
Is after __bss_start, not __vmlinux_end Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S
index 5fe1513e447a..5d502b9ab56d 100644
--- a/arch/cris/arch-v32/kernel/head.S
+++ b/arch/cris/arch-v32/kernel/head.S
@@ -367,7 +367,7 @@ _no_romfs_in_flash:
;; For jffs2, a jhead is prepended which contains with magic and length.
;; The jhead is not part of the jffs2 partition however.
#ifndef CONFIG_ETRAXFS_SIM
- move.d __vmlinux_end, $r0
+ move.d __bss_start, $r0
#else
move.d __end, $r0
#endif