From patchwork Tue Sep 12 10:36:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112290 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4986330qgf; Tue, 12 Sep 2017 03:38:44 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCFuS7bZJ2dP97b+7ZnOFCVW55M+WIpEqoX3sbifZIVIj1v622AGqCcxTPbvOET30CHVfxg X-Received: by 10.36.33.78 with SMTP id e75mr384118ita.128.1505212724586; Tue, 12 Sep 2017 03:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505212724; cv=none; d=google.com; s=arc-20160816; b=Cu/c+2eS2w0U5KS8wpQMSuByyOlLMGvHB+LzRUr4K5vcibIB+QWdpdoyRW+Q46gQ30 UvfZUx5gLtFc8RZxH0hxd73iphg208a6jqiyLbj2fGQ/Q3Z9F8XMvl9oBmKNN1GNy8SS eZ3Yfk3qeb189THurVtJeHIMhrQwfb0Q76ZsrKIklfpgk4MKnB0HtJf59L/f6JHeBuvl x4/uxAUDfW4zGnPxUkDdgvMzzjZAVOcb246JabVLqE0MCAxYJ1iXjdPr5dJuWVvXk+FJ PSH0puknCWGdjMpwHK8HJiCBdH18IAHYiXEk3weEXV+gaRPH+gaC0c4TWBMYzYVyH+ol Cssw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=pN30eCytd985nM+mIOl+XQCEgsjk2VVuwNln/Xr0hBA=; b=f5auNmPWBhy2qasl+bnpuz7uQro/B3zDjidW5uyu1X2X51IIFEMOil3MNZWYhKEmw6 UPYhCOIbPl2leYIcl8MY+2T9vwrHdg5K97y2cDO6HP+/6EaERir7A7n1qTLx2ne+CRJO r4c+eycXt4cQb9dMrceq3KMqkVmdfKuXZW1pbbCT70IGfPt/CAE2lfkO7TNQeDKyUyMj Fl0NbJQ2FS52jGf/Z6D/hE2AMypF5Jf2nD91fiS14gNtu84MCdLC0OmqHvlitKp6V4MD KHIJxBsRNiLXT77LsZPMX9hYKMgy5V9/PDjxI8qZd2upbXMWint+rE4GD+qTcphE8xox wPtg== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id p78si10583888ioi.287.2017.09.12.03.38.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 03:38:44 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1driYb-0001Rj-G9; Tue, 12 Sep 2017 10:36:41 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1driYa-0001OP-4d for xen-devel@lists.xen.org; Tue, 12 Sep 2017 10:36:40 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id BA/13-03454-7B8B7B95; Tue, 12 Sep 2017 10:36:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRWlGSWpSXmKPExsVysyfVTXfrju2 RBgcuSlss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBk/l05nLVjMX3H8qkMD40LeLkYuDiGBzYwS S/+2sEA4pxklVu24xdTFyMnBJqApcefzJzBbREBa4trny4wgNrNAnMT7RY0sILawgJvExuY3Q DYHB4uAqkTvQV+QMK+ApcTReV+ZQWwJAXmJXW0XWUFsTgEriUWvFoCVCwHVXNosOYGRewEjwy pGjeLUorLUIl1DA72kosz0jJLcxMwcIM9MLze1uDgxPTUnMalYLzk/dxMj0LcMQLCD8fj7uEO MkhxMSqK8R9ZvjxTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwXtyO1BOsCg1PbUiLTMHGGQwaQkO HiUR3nMgad7igsTc4sx0iNQpRl2Ojpt3/zAJseTl56VKifOWghQJgBRllObBjYAF/CVGWSlhX kago4R4ClKLcjNLUOVfMYpzMCoJ814FmcKTmVcCt+kV0BFMQEfwXNoCckRJIkJKqoGxfq2Tio jZdN+CfQGvN56+dXKNFoOVqPrv4uXSs71+iv46rOm2r/3Tv8tPcxvcuObEmyzM2qPK8sXh8qI Eh97izTUxTT1sc03TtU1CczwK04rXX45kO1iaeGruq02vbrH+ETq4+XBTyJNPn5e6bDGJPGHG aPG7h/+DR5OBWtD5swE5deu8+NSUWIozEg21mIuKEwHzaeAjcwIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1505212597!82461341!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34886 invoked from network); 12 Sep 2017 10:36:37 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-21.messagelabs.com with SMTP; 12 Sep 2017 10:36:37 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BC27215A2; Tue, 12 Sep 2017 03:36:36 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CE1A33F578; Tue, 12 Sep 2017 03:36:35 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Sep 2017 11:36:21 +0100 Message-Id: <20170912103622.18562-7-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912103622.18562-1-julien.grall@arm.com> References: <20170912103622.18562-1-julien.grall@arm.com> Cc: bhupinder.thakur@linaro.org, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 6/7] xen/arm: Move sysregs.h in arm64 sub-directory X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" sysregs.h contains only code protected by #ifdef CONFIG_ARM_64. Move it in arm64 sub-directory to reflect that and remove the #ifdef. At the same time, fixup the guards. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/arm64/processor.h | 2 ++ xen/include/asm-arm/{ => arm64}/sysregs.h | 10 +++------- xen/include/asm-arm/processor.h | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) rename xen/include/asm-arm/{ => arm64}/sysregs.h (98%) diff --git a/xen/include/asm-arm/arm64/processor.h b/xen/include/asm-arm/arm64/processor.h index 24f836b023..c18ab7203d 100644 --- a/xen/include/asm-arm/arm64/processor.h +++ b/xen/include/asm-arm/arm64/processor.h @@ -3,6 +3,8 @@ #include +#include + #ifndef __ASSEMBLY__ /* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/arm64/sysregs.h similarity index 98% rename from xen/include/asm-arm/sysregs.h rename to xen/include/asm-arm/arm64/sysregs.h index 887368e248..084d2a1e5d 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/arm64/sysregs.h @@ -1,7 +1,5 @@ -#ifndef __ASM_ARM_SYSREGS_H -#define __ASM_ARM_SYSREGS_H - -#ifdef CONFIG_ARM_64 +#ifndef __ASM_ARM_ARM64_SYSREGS_H +#define __ASM_ARM_ARM64_SYSREGS_H #include @@ -168,9 +166,7 @@ #define ICH_AP1R2_EL2 __AP1Rx_EL2(2) #define ICH_AP1R3_EL2 __AP1Rx_EL2(3) -#endif - -#endif +#endif /* _ASM_ARM_ARM64_SYSREGS_H */ /* * Local variables: diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 9f7a42f86b..d791c12c9c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -2,7 +2,6 @@ #define __ASM_ARM_PROCESSOR_H #include -#include #ifndef __ASSEMBLY__ #include #endif