From 645dea1f411dd2d825b2145f9665f732ed58168f Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 2 Aug 2010 17:48:31 +0200 Subject: [PATCH] --- yaml --- r: 207121 b: refs/heads/master c: b4973ae9dac3397499f5576c591d5c5bf51c68c6 h: refs/heads/master i: 207119: a33437eee66e00d13ca165ecbebc5c560717664e v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0077fef92d3..3865b7f75492 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d77eab8cb18dc4b8adfa82088e95b48c654c66b9 +refs/heads/master: b4973ae9dac3397499f5576c591d5c5bf51c68c6 diff --git a/trunk/arch/cris/arch-v10/kernel/head.S b/trunk/arch/cris/arch-v10/kernel/head.S index fc4577102933..a1f2014b4e3b 100644 --- a/trunk/arch/cris/arch-v10/kernel/head.S +++ b/trunk/arch/cris/arch-v10/kernel/head.S @@ -280,7 +280,7 @@ _no_romfs_in_flash: ;; the "rom fs" we'll possibly use in 2.4 if not JFFS (which does ;; not need this mechanism anyway) - move.d __vmlinux_end, $r0; the image will be after the vmlinux end address + move.d __init_end, $r0; the image will be after the end of init move.d [$r0], $r1 ; cramfs assumes same endian on host/target cmp.d CRAMFS_MAGIC, $r1; magic value in cramfs superblock bne 2f