From patchwork Fri Apr 17 21:17:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 462194 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E0466140293 for ; Sat, 18 Apr 2015 07:18:31 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id C04E31A0D50 for ; Sat, 18 Apr 2015 07:18:31 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0130.outbound.protection.outlook.com [157.56.111.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 2BD601A0028 for ; Sat, 18 Apr 2015 07:17:39 +1000 (AEST) Received: from CY1PR03MB1485.namprd03.prod.outlook.com (0.163.17.158) by CY1PR03MB1374.namprd03.prod.outlook.com (0.163.16.28) with Microsoft SMTP Server (TLS) id 15.1.136.25; Fri, 17 Apr 2015 21:17:33 +0000 Authentication-Results: kernel.crashing.org; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.49) by CY1PR03MB1485.namprd03.prod.outlook.com (0.163.17.158) with Microsoft SMTP Server (TLS) id 15.1.136.25; Fri, 17 Apr 2015 21:17:24 +0000 From: Scott Wood To: Benjamin Herrenschmidt , Michael Ellerman Subject: [PATCH] powerpc/mm: Use PFN_PHYS() in devmem_is_allowed() Date: Fri, 17 Apr 2015 16:17:14 -0500 Message-ID: <1429305434-4324-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BLUPR08CA0038.namprd08.prod.outlook.com (10.141.200.18) To CY1PR03MB1485.namprd03.prod.outlook.com (25.163.17.158) X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1485; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1374; X-Microsoft-Antispam-PRVS: X-Forefront-Antispam-Report: BMV:1; SFV:NSPM; SFS:(10019020)(6009001)(33646002)(46102003)(36756003)(50986999)(19580395003)(19580405001)(50226001)(77156002)(66066001)(47776003)(50466002)(86362001)(87976001)(42186005)(62966003)(48376002)(40100003)(122386002)(92566002)(229853001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1485; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(5002010); SRVR:CY1PR03MB1485; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1485; X-Forefront-PRVS: 0549E6FD50 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2015 21:17:24.1787 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1485 X-OriginatorOrg: freescale.com Cc: Scott Wood , linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This function can run on systems where physical addresses don't fit in unsigned long, so make sure to use the macro that contains the proper cast. Signed-off-by: Scott Wood --- arch/powerpc/mm/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 7297d204..07052d9 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -563,7 +563,7 @@ subsys_initcall(add_system_ram_resources); */ int devmem_is_allowed(unsigned long pfn) { - if (iomem_is_exclusive(pfn << PAGE_SHIFT)) + if (iomem_is_exclusive(PFN_PHYS(pfn))) return 0; if (!page_is_ram(pfn)) return 1;