From patchwork Fri Apr 18 15:54:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 28639 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4C7162013D for ; Fri, 18 Apr 2014 15:54:56 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf4295961ykp.1 for ; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=NaSOOmMvxYUDXvPO7EsEuadMVKMOGG92cQhuPoD8Zwg=; b=c8OhehWRt1bMH7qaEoCBXFcYKkvs65rMi+V59hcd4GsJpytwdXcK7KZrdfn5+3p+Ty 5pnDYfLrpI/o1ti9hM3qeDDVoP+0xcA87uPOhq9gYSrtdqLJkqNDHLoBTqqQOVHRfb7l KN9bqf9FpcIGljJQ/LUkvfe4aKN6CCAqEweXC8UoMJWO9r6DKS1M104FXZyIK7nCoJ3t XIBRcX+nDDoA1DheD0Rs+cxX/Ir6FcGx/u+muuh7W1kWnLScuBu0Hz/zXkG3wjGdnBVa M6LbAmyqgHERsP1yQLX+TGn5BOFQMdZ88GLRK4JILx1R9tu6R019WLafnvEOgodwZw0V dQDA== X-Gm-Message-State: ALoCoQl5uGHQ3Zu3oJhg081Vr7FEwvdrP99tKQFlvuiWOejy9F7agYikTKow7Qki/jz5PFUwseet X-Received: by 10.224.36.137 with SMTP id t9mr8917368qad.4.1397836495932; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.8 with SMTP id l8ls1581297qge.27.gmail; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) X-Received: by 10.220.10.2 with SMTP id n2mr3467244vcn.26.1397836495845; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id tv3si5012007vdc.72.2014.04.18.08.54.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Apr 2014 08:54:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so3194802veb.31 for ; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) X-Received: by 10.52.164.237 with SMTP id yt13mr12045915vdb.18.1397836495753; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp121884vcb; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) X-Received: by 10.68.215.40 with SMTP id of8mr22730392pbc.15.1397836495043; Fri, 18 Apr 2014 08:54:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wh4si16555968pbc.477.2014.04.18.08.54.54; Fri, 18 Apr 2014 08:54:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753240AbaDRPyq (ORCPT + 26 others); Fri, 18 Apr 2014 11:54:46 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:62702 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751459AbaDRPyn (ORCPT ); Fri, 18 Apr 2014 11:54:43 -0400 Received: by mail-ee0-f50.google.com with SMTP id c13so1719388eek.23 for ; Fri, 18 Apr 2014 08:54:42 -0700 (PDT) X-Received: by 10.14.7.65 with SMTP id 41mr2455252eeo.100.1397836482743; Fri, 18 Apr 2014 08:54:42 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id w12sm77689277eez.36.2014.04.18.08.54.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Apr 2014 08:54:42 -0700 (PDT) From: Julien Grall To: stefano.stabellini@eu.citrix.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, ian.campbell@citrix.com, david.vrabel@citrix.com, konrad.wilk@oracle.com, Julien Grall Subject: [PATCH] arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h Date: Fri, 18 Apr 2014 16:54:34 +0100 Message-Id: <1397836474-10478-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , virt_to_pfn has been defined in asm/memory.h by the commit e26a9e0 "ARM: Better virt_to_page() handling" This will result of a compilation warning when CONFIG_XEN is enabled. arch/arm/include/asm/xen/page.h:80:0: warning: "virt_to_pfn" redefined [enabled by default] #define virt_to_pfn(v) (PFN_DOWN(__pa(v))) ^ In file included from arch/arm/include/asm/page.h:163:0, from arch/arm/include/asm/xen/page.h:4, from include/xen/page.h:4, from arch/arm/xen/grant-table.c:33: The definition in memory.h is nearly the same (it directly expand PFN_DOWN), so we can safely drop virt_to_pfn in xen include. Signed-off-by: Julien Grall --- arch/arm/include/asm/xen/page.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h index cf4f3e8..ded062f 100644 --- a/arch/arm/include/asm/xen/page.h +++ b/arch/arm/include/asm/xen/page.h @@ -77,7 +77,6 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine) } /* VIRT <-> MACHINE conversion */ #define virt_to_machine(v) (phys_to_machine(XPADDR(__pa(v)))) -#define virt_to_pfn(v) (PFN_DOWN(__pa(v))) #define virt_to_mfn(v) (pfn_to_mfn(virt_to_pfn(v))) #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))