linux-mips
[Top] [All Lists]

Re: [PATCH RESEND 2/6] MIPS: pfn_valid() is broken on low memory HIGHMEM

To: Kevin Cernekee <cernekee@gmail.com>
Subject: Re: [PATCH RESEND 2/6] MIPS: pfn_valid() is broken on low memory HIGHMEM systems
From: David Daney <ddaney@caviumnetworks.com>
Date: Thu, 06 Jan 2011 09:36:35 -0800
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
In-reply-to: <b2191149ada0fd929b3818c51298ae8d@localhost>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <8eec0c63f92528c501c0e6a0c8396359@localhost> <b2191149ada0fd929b3818c51298ae8d@localhost>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.15) Gecko/20101027 Fedora/3.0.10-1.fc12 Thunderbird/3.0.10
On 01/05/2011 11:31 PM, Kevin Cernekee wrote:
[...]
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 2efcbd2..18183a4 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -370,7 +370,7 @@ void __init mem_init(void)
  #ifdef CONFIG_DISCONTIGMEM
  #error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet"
  #endif
-       max_mapnr = highend_pfn;
+       max_mapnr = highend_pfn ? : max_low_pfn;

That is not standard C.

How about: max_mapnr = highend_pfn ? highend_pfn : max_low_pfn;

David Daney

<Prev in Thread] Current Thread [Next in Thread>