From patchwork Tue Oct 5 08:16:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 231401 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o958FZET017799 for ; Tue, 5 Oct 2010 08:15:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755460Ab0JEIPe (ORCPT ); Tue, 5 Oct 2010 04:15:34 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:33618 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752392Ab0JEIPe (ORCPT ); Tue, 5 Oct 2010 04:15:34 -0400 Received: by pvg2 with SMTP id 2so1542698pvg.19 for ; Tue, 05 Oct 2010 01:15:33 -0700 (PDT) Received: by 10.114.131.13 with SMTP id e13mr13129725wad.81.1286266533616; Tue, 05 Oct 2010 01:15:33 -0700 (PDT) Received: from localhost.localdomain (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id o17sm10941586wal.21.2010.10.05.01.15.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 05 Oct 2010 01:15:32 -0700 (PDT) From: Nobuhiro Iwamatsu To: linux-sh@vger.kernel.org Cc: Nobuhiro Iwamatsu , Nobuhiro Iwamatsu Subject: [PATCH] sh: Fix address calculation of Initrd Date: Tue, 5 Oct 2010 17:16:08 +0900 Message-Id: <1286266568-23206-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.1 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 (demeter1.kernel.org [140.211.167.41]); Tue, 05 Oct 2010 08:15:36 +0000 (UTC) diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index f24d0ea..4e27846 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -135,8 +135,9 @@ void __init check_for_initrd(void) goto disable; } - if (unlikely(start < PAGE_OFFSET)) { - pr_err("initrd start < PAGE_OFFSET\n"); + if (unlikely(start < __MEMORY_START)) { + pr_err("initrd start (%08lx) < __MEMORY_START(%x)\n", + start, __MEMORY_START); goto disable; } @@ -157,7 +158,7 @@ void __init check_for_initrd(void) /* * Address sanitization */ - initrd_start = (unsigned long)__va(__pa(start)); + initrd_start = (unsigned long)__va(start); initrd_end = initrd_start + INITRD_SIZE; memblock_reserve(__pa(initrd_start), INITRD_SIZE);