Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757475AbaDXOMB (ORCPT ); Thu, 24 Apr 2014 10:12:01 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:5309 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753885AbaDXOL7 (ORCPT ); Thu, 24 Apr 2014 10:11:59 -0400 X-IronPort-AV: E=Sophos;i="4.97,919,1389744000"; d="scan'208";a="123123545" Message-ID: <53591B8F.8070300@citrix.com> Date: Thu, 24 Apr 2014 15:11:27 +0100 From: David Vrabel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20121215 Iceowl/1.0b1 Icedove/3.0.11 MIME-Version: 1.0 To: Julien Grall CC: , , , , , Subject: Re: [PATCH] arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h References: <1397836474-10478-1-git-send-email-julien.grall@linaro.org> <535901F0.3010908@citrix.com> <53590845.1090405@linaro.org> In-Reply-To: <53590845.1090405@linaro.org> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.80.2.76] X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24/04/14 13:49, Julien Grall wrote: > Hi David, > > On 04/24/2014 01:22 PM, David Vrabel wrote: >> On 18/04/14 16:54, Julien Grall wrote: >>> 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. >> >> >> This breaks the arm build for me. >> >> /local/davidvr/work/k.org/tip/drivers/block/xen-blkfront.c: In function >> ?setup_blkring?: >> /local/davidvr/work/k.org/tip/drivers/block/xen-blkfront.c:1236:2: >> error: implicit declaration of function ?virt_to_pfn? >> [-Werror=implicit-function-declaration] >> err = xenbus_grant_ring(dev, virt_to_mfn(info->ring.sring)); >> ^ > > I don't have any issue to build the following branch with this patch on: > - v3.15-rc2 > - xentip master > - xentip for-linus-3.16 Applied to devel/for-linus-3.16. If something else turns up for 3.15 (and I remember) I'll take it for 3.15 instead. Thanks. David -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/