From mboxrd@z Thu Jan  1 00:00:00 1970
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Jan 2011 18:36:44 +0100 (CET)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:18810 "EHLO
        mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)
        by eddie.linux-mips.org with ESMTP id S1490979Ab1AFRgl (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Thu, 6 Jan 2011 18:36:41 +0100
Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,7,2,8378)
        id <B4d25fdd30000>; Thu, 06 Jan 2011 09:37:23 -0800
Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.4675);
         Thu, 6 Jan 2011 09:36:36 -0800
Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675);
         Thu, 6 Jan 2011 09:36:36 -0800
Message-ID: <4D25FDA3.5000807@caviumnetworks.com>
Date:   Thu, 06 Jan 2011 09:36:35 -0800
From:   David Daney <ddaney@caviumnetworks.com>
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
MIME-Version: 1.0
To:     Kevin Cernekee <cernekee@gmail.com>
CC:     Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH RESEND 2/6] MIPS: pfn_valid() is broken on low memory
 HIGHMEM systems
References: <8eec0c63f92528c501c0e6a0c8396359@localhost> <b2191149ada0fd929b3818c51298ae8d@localhost>
In-Reply-To: <b2191149ada0fd929b3818c51298ae8d@localhost>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-OriginalArrivalTime: 06 Jan 2011 17:36:36.0098 (UTC) FILETIME=[444A5E20:01CBADC8]
Return-Path: <David.Daney@caviumnetworks.com>
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: 28869
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: ddaney@caviumnetworks.com
Precedence: bulk
X-list: linux-mips

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