From patchwork Thu Jan 27 20:31:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 80733 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 330AEB7157 for ; Fri, 28 Jan 2011 07:32:06 +1100 (EST) Received: from DB3EHSOBE005.bigfish.com (db3ehsobe005.messaging.microsoft.com [213.199.154.143]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Cybertrust SureServer Standard Validation CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 125BDB712F for ; Fri, 28 Jan 2011 07:31:53 +1100 (EST) Received: from mail58-db3-R.bigfish.com (10.3.81.251) by DB3EHSOBE005.bigfish.com (10.3.84.25) with Microsoft SMTP Server id 14.1.225.8; Thu, 27 Jan 2011 20:31:46 +0000 Received: from mail58-db3 (localhost.localdomain [127.0.0.1]) by mail58-db3-R.bigfish.com (Postfix) with ESMTP id 4E5D915000C3; Thu, 27 Jan 2011 20:31:46 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h637h668h) X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw02.freescale.net; RD:de01egw02.freescale.net; EFVD:NLI Received: from mail58-db3 (localhost.localdomain [127.0.0.1]) by mail58-db3 (MessageSwitch) id 1296160306207659_29832; Thu, 27 Jan 2011 20:31:46 +0000 (UTC) Received: from DB3EHSMHS002.bigfish.com (unknown [10.3.81.247]) by mail58-db3.bigfish.com (Postfix) with ESMTP id 2F03649004C; Thu, 27 Jan 2011 20:31:46 +0000 (UTC) Received: from de01egw02.freescale.net (192.88.165.103) by DB3EHSMHS002.bigfish.com (10.3.87.102) with Microsoft SMTP Server (TLS) id 14.1.225.8; Thu, 27 Jan 2011 20:31:44 +0000 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by de01egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p0RKVg11008529; Thu, 27 Jan 2011 13:31:42 -0700 (MST) Received: from udp111988uds.am.freescale.net (udp111988uds.am.freescale.net [10.82.120.180]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p0RKVfGO023251; Thu, 27 Jan 2011 14:31:41 -0600 (CST) Date: Thu, 27 Jan 2011 14:31:38 -0600 From: Scott Wood To: Subject: [PATCH] powerpc: fix pfn_valid() when memory starts at a non-zero address Message-ID: <20110127203137.GA30996@udp111988uds.am.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginatorOrg: freescale.com Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org max_mapnr is a pfn, not an index innto mem_map[]. So don't add ARCH_PFN_OFFSET a second time. Signed-off-by: Scott Wood --- arch/powerpc/include/asm/page.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 53b64be..da4b200 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -101,7 +101,7 @@ extern phys_addr_t kernstart_addr; #ifdef CONFIG_FLATMEM #define ARCH_PFN_OFFSET (MEMORY_START >> PAGE_SHIFT) -#define pfn_valid(pfn) ((pfn) >= ARCH_PFN_OFFSET && (pfn) < (ARCH_PFN_OFFSET + max_mapnr)) +#define pfn_valid(pfn) ((pfn) >= ARCH_PFN_OFFSET && (pfn) < max_mapnr) #endif #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)