From nobody Tue May 7 11:21:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1610739029; cv=none; d=zohomail.com; s=zohoarc; b=O5E9L6+mu4QkRej4/2uv2ToaTViObad1aStRW2kKvUPeNCnElKjoe7Rm+6ZB3eR423uNZC57NCK6ZL6+SsLCg25LKid0mZU7DaJnP77S8iv0mIOsRXhC8eSFbBRyuFU6o8k2iLiXIJXS1yo+k8qWNXxIMdIopNXY2aE4skJ73Bc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610739029; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=iIEwED8NVg3+0QRXW1D5BpGCsMVZAFmTGQJ6WbMy8W8=; b=C4Aa42di5LT1eg2kyDUMefYbnrIxJAH/f92ok+2EE9jE/nN7N+wLr7iIitff2LNRADH4V3XKY0UpcPUhYhx9lzZcUpxctVPS839KEqv0DgFC36htpwo+bEmDhskrHhbDqCckW5rIay+HjHBObsnNH3AX4j8W0tP9pOW6pLQvSsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1610739029891632.7907444019154; Fri, 15 Jan 2021 11:30:29 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.68577.122745 (Exim 4.92) (envelope-from ) id 1l0UnO-0004lg-0C; Fri, 15 Jan 2021 19:30:06 +0000 Received: by outflank-mailman (output) from mailman id 68577.122745; Fri, 15 Jan 2021 19:30:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0UnN-0004lA-SZ; Fri, 15 Jan 2021 19:30:05 +0000 Received: by outflank-mailman (input) for mailman id 68577; Fri, 15 Jan 2021 19:30:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0UnM-0004cK-Tw for xen-devel@lists.xenproject.org; Fri, 15 Jan 2021 19:30:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0UnM-0002re-Dz; Fri, 15 Jan 2021 19:30:04 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l0UnM-0007hU-1b; Fri, 15 Jan 2021 19:30:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version: Message-Id:Date:Subject:Cc:To:From; bh=iIEwED8NVg3+0QRXW1D5BpGCsMVZAFmTGQJ6WbMy8W8=; b=5sqojSb7VK/XPlgZAmUih0v5yU +J5P2JzyBIy8JDG/vetGptU1+pKeW1Sg14/NhUoVgZH3sWkF9D9IqyR8siOGn58uZi2a7MiU0YFF5 spBj9PpjUkjqGI1NkLakzr5ufTbxTgp6wtQ7R+/c7nrWMGOj80Zh6yoESWW8K1rUD6Ns=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: andrew.cooper3@citrix.com, Julien Grall , Konrad Rzeszutek Wilk , Ross Lagerwall , Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH] xen/arm: livepatch: Include xen/mm.h rather than asm/mm.h Date: Fri, 15 Jan 2021 19:29:47 +0000 Message-Id: <20210115192947.6499-1-julien@xen.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) From: Julien Grall Livepatch fails to build on Arm after commit ced9795c6cb4 "mm: split out mfn_t / gfn_t / pfn_t definitions and helpers": In file included from livepatch.c:13:0: /oss/xen/xen/include/asm/mm.h:32:28: error: field =E2=80=98list=E2=80=99 ha= s incomplete type struct page_list_entry list; ^~~~ /oss/xen/xen/include/asm/mm.h:53:43: error: =E2=80=98MAX_ORDER=E2=80=99 und= eclared here (not in a function); did you mean =E2=80=98PFN_ORDER=E2=80=99? unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~ PFN_ORDER /oss/xen/xen/include/asm/mm.h:53:31: error: bit-field =E2=80=98first_dirty= =E2=80=99 width not an integer constant unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~~~ This is happening because asm/mm.h is included directly by livepatch.c. Yet it depends on xen/mm.h to be included first so MAX_ORDER is defined. Resolve the build failure by including xen/mm.h rather than asm/mm.h. Fixes: ced9795c6cb4 ("mm: split out mfn_t / gfn_t / pfn_t definitions and h= elpers") Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Reviewed-by: Konrad Rzeszutek Wilk --- xen/arch/arm/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index 915e9d926a11..75e8adcfd6a1 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -6,11 +6,11 @@ #include #include #include +#include #include =20 #include #include -#include =20 /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn --=20 2.17.1