From 02e932c6c9572d676ecf9618aa428f19ca280a4f Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Sat, 24 Apr 2010 13:28:20 +0100 Subject: [PATCH] --- yaml --- r: 191627 b: refs/heads/master c: b161313ae8d9c64de589d1de72f975210ce37b48 h: refs/heads/master i: 191625: 73974ac5a4f3fc4a621b9a423dfd8b63c1e9eeeb 191623: 558275c26714b803c768337c2742cb5590e7ef38 v: v3 --- [refs] | 2 +- trunk/arch/sh/boot/compressed/head_32.S | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fa3f277bf6fb..5e9f7d14a18a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c4584d39a8a144c60adaf4cf998c3233b6683d9 +refs/heads/master: b161313ae8d9c64de589d1de72f975210ce37b48 diff --git a/trunk/arch/sh/boot/compressed/head_32.S b/trunk/arch/sh/boot/compressed/head_32.S index 02a30935f0b9..200c1d4f1efe 100644 --- a/trunk/arch/sh/boot/compressed/head_32.S +++ b/trunk/arch/sh/boot/compressed/head_32.S @@ -97,7 +97,11 @@ init_stack_addr: decompress_kernel_addr: .long decompress_kernel kernel_start_addr: +#ifdef CONFIG_32BIT + .long ___pa(_text+PAGE_SIZE) +#else .long _text+PAGE_SIZE +#endif .align 9 fake_headers_as_bzImage: