From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 13 Oct 2006 13:42:10 +0100 (BST) Received: from nf-out-0910.google.com ([64.233.182.188]:47852 "EHLO nf-out-0910.google.com") by ftp.linux-mips.org with ESMTP id S20038827AbWJMMjM (ORCPT ); Fri, 13 Oct 2006 13:39:12 +0100 Received: by nf-out-0910.google.com with SMTP id a25so860040nfc for ; Fri, 13 Oct 2006 05:39:09 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=txJeiLa7xVnnPxikh+Jd1jQ8RO2laeMfghjbT4Svld61sCqdOfdkkzV66orAXGmqJ4qar5ZAPY+An9n72LGY3qdtZmsqToKTOXgqbsboWjaVgZMsNqpl+dIuoIziB0bF+F41T+rzcGl5D86QWkfLcMzP2MLsUst5b84Kb8cwxVE= Received: by 10.48.210.20 with SMTP id i20mr6888780nfg; Fri, 13 Oct 2006 05:39:09 -0700 (PDT) Received: from spoutnik.innova-card.com ( [81.252.61.1]) by mx.google.com with ESMTP id r33sm856094nfc.2006.10.13.05.39.08; Fri, 13 Oct 2006 05:39:09 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id 9209D23F770; Fri, 13 Oct 2006 14:39:06 +0200 (CEST) To: ralf@linux-mips.org Cc: anemo@mba.ocn.ne.jp, ths@networkno.de, linux-mips@linux-mips.org, Franck Bui-Huu Subject: [PATCH 3/7] setup.c: get ride of CPHYSADDR() Date: Fri, 13 Oct 2006 14:39:02 +0200 Message-Id: <11607431462937-git-send-email-fbuihuu@gmail.com> X-Mailer: git-send-email 1.4.2.3 In-Reply-To: <11607431461469-git-send-email-fbuihuu@gmail.com> References: <11607431461469-git-send-email-fbuihuu@gmail.com> From: Franck Bui-Huu Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 12936 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips and use new __pa() implementation instead introduced by the previous patch. Indeed this macro can be used now even by the 64 bit kernels with CONFIG_BUILD_ELF64=n config. Signed-off-by: Franck Bui-Huu --- arch/mips/kernel/setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index fdbb508..00d62bd 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -204,12 +204,12 @@ static void __init finalize_initrd(void) printk(KERN_INFO "Initrd not found or empty"); goto disable; } - if (CPHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) { + if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { printk("Initrd extends beyond end of memory"); goto disable; } - reserve_bootmem(CPHYSADDR(initrd_start), size); + reserve_bootmem(__pa(initrd_start), size); initrd_below_start_ok = 1; printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", @@ -256,7 +256,7 @@ static void __init bootmem_init(void) * of usable memory. */ reserved_end = init_initrd(); - reserved_end = PFN_UP(CPHYSADDR(max(reserved_end, (unsigned long)&_end))); + reserved_end = PFN_UP(__pa(max(reserved_end, (unsigned long)&_end))); /* * Find the highest page frame number we have available. -- 1.4.2.3