From 91aee8096d61f5d15b96d199736f94a398fadbd4 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 2 Aug 2010 18:23:39 +0200 Subject: [PATCH] --- yaml --- r: 207126 b: refs/heads/master c: 403a1c4f1380b4ec842df5f4aa86e86ba02904f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v32/kernel/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fe8ffa8e5744..8b0d7d4ec9fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 345c52e079001354809c17f84e164827e99f2aaa +refs/heads/master: 403a1c4f1380b4ec842df5f4aa86e86ba02904f3 diff --git a/trunk/arch/cris/arch-v32/kernel/head.S b/trunk/arch/cris/arch-v32/kernel/head.S index 5fe1513e447a..5d502b9ab56d 100644 --- a/trunk/arch/cris/arch-v32/kernel/head.S +++ b/trunk/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