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: 4017071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 811599F2BA for ; Fri, 18 Apr 2014 15:57:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 743A320279 for ; Fri, 18 Apr 2014 15:57:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F31120270 for ; Fri, 18 Apr 2014 15:57:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WbB8B-000836-4K; Fri, 18 Apr 2014 15:55:11 +0000 Received: from mail-ee0-f43.google.com ([74.125.83.43]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WbB88-0006d4-TX for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2014 15:55:09 +0000 Received: by mail-ee0-f43.google.com with SMTP id e53so1747290eek.2 for ; Fri, 18 Apr 2014 08:54:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Nhu29H/tIBGb7xXmn6hzBabn4sLp1uU3qGboDnUqYb0=; b=ZA/Ug6XaujCOXSi+dd5JEobDImHZBd1aE628Odzad1VK6ybLc6XmXQE/MrbUAJLPSJ DgZs4gOR/+3ncOtswZJy5nAzk+/mMZnWYtj4FwLu7lExeMxQ3tu6oh8tqUvedjvhAvdp vOBX100aXsPV2OIqOkVDfU5xhANBphMGuVRe7vINIMTmLyxsMzjfi2KGwhChlGCrHP76 B3jxq2C64B5Czzp1xki+YZW6wa+RUaCph6iQ70e5OybP0kmtX0KOJx9oE6ognk/bHh80 obfBCxpP7quqsO5MvJIvK6MHLc4LTo2BaTfYY4lVlVUXnPL75F9VtISr3c2luCBZM/RX PhKw== X-Gm-Message-State: ALoCoQnEtGlNEXnzQs/CkNCoDnNp/cDjnZ7YuvR3zofRl0b7h/JAf0DBVDl+Zjz2efCWtIwRgS08 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140418_085509_102151_4339CF8E X-CRM114-Status: GOOD ( 10.51 ) X-Spam-Score: -0.7 (/) Cc: ian.campbell@citrix.com, konrad.wilk@oracle.com, Julien Grall , linux-kernel@vger.kernel.org, david.vrabel@citrix.com, xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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))