From patchwork Mon Feb 15 08:37:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 79364 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1F8bcVN008061 for ; Mon, 15 Feb 2010 08:38:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751289Ab0BOIiM (ORCPT ); Mon, 15 Feb 2010 03:38:12 -0500 Received: from mail-iw0-f201.google.com ([209.85.223.201]:57441 "EHLO mail-iw0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751382Ab0BOIiM (ORCPT ); Mon, 15 Feb 2010 03:38:12 -0500 Received: by iwn39 with SMTP id 39so1955119iwn.1 for ; Mon, 15 Feb 2010 00:38:10 -0800 (PST) MIME-Version: 1.0 Received: by 10.231.169.145 with SMTP id z17mr3169983iby.83.1266223090310; Mon, 15 Feb 2010 00:38:10 -0800 (PST) From: Nobuhiro Iwamatsu Date: Mon, 15 Feb 2010 17:37:50 +0900 X-Google-Sender-Auth: c7e552948dbf2903 Message-ID: <29ab51dc1002150037i60fb846dt60a739cfddb39d08@mail.gmail.com> Subject: [PATCH to v2.6.33] sh: Fix cannot booting zImage using CONFIG_PMB_FIXED To: Linux-sh Cc: Paul Mundt , Yoshihiro Shimoda Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 15 Feb 2010 08:38:13 +0000 (UTC) diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index d509a50..5ff6dfc 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c @@ -117,7 +117,7 @@ void decompress_kernel(void) output_addr = (CONFIG_MEMORY_START + 0x2000); #else output_addr = __pa((unsigned long)&_text+PAGE_SIZE); -#ifdef CONFIG_29BIT +#if defined(CONFIG_29BIT) || defined(CONFIG_PMB_FIXED) output_addr |= P2SEG; #endif #endif