From patchwork Fri Aug 11 18:02:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 109914 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1250206qge; Fri, 11 Aug 2017 11:05:29 -0700 (PDT) X-Received: by 10.107.3.41 with SMTP id 41mr13820077iod.309.1502474729835; Fri, 11 Aug 2017 11:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502474729; cv=none; d=google.com; s=arc-20160816; b=JhB89S2Qe/18stQOXk9IhQ4yQqDUVDXa2jpgr7rjv1jadcmdQlCAoWt/3oBFyDxGPi TS1up5YsSx5d1IeLMuC1k1dXp5wPHYmWtb4uUBLyTLWS5kEIuxu2FQRRwU+bzIpvrss2 dpQY83zGERKUu22IltoRw84OrbZe+EAZ3AMLw+dT0XBuOY7xXdJNC5r3QYhWb31m44X4 ljc0SkS4NZzeRtaRWxUEaPakNkiKlwCDpxKxZAo5G+H6MS7+sZ5bMymUEGliXYx4WxEx tY1FRNh5eIpyBe8gPcwhm47NtgtuOtj1+53E96R+B6bS517Ov9NRRZNQMIJGOukAGw3/ pEWw== 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=7GTu70fg1PgxLGBVvkuQM7da8bHb6cVBgqSUTj6Qovo=; b=Wr51eGGIUsjPxnjHB/wPh0P2/E9sPjRBSUo0fKdLhJ9NWlAdWniv5NXSsVB7HyJrNE fI51uotztDQi/gMluM+tfCZsBDEBIC1bpPiWMYTH12ZZws4PvVBif+RBkgzTLaWTS0Uf vAy86vd3Nvvbv/wLE83pmH5jDCC+thcQkPm0BRB6DUhYLowVv2PFYpzPzU+OK7ecZOaB xyz7zGJDS92j30mdNfM0IagjbhSJ/LNGRJ/uXg6vwlAkWd/y84tCX4Fv56K2+F6DpYh4 4m0YMxmsMDCHBHqAHD5cRX9W7V9FAoJjZ+EGbqaF2k4RSjp5ecK/2rPGOFW9eeBWX4VQ sMQA== 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 91si1425396ioi.126.2017.08.11.11.05.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2017 11:05:29 -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 1dgEHI-0002ct-TR; Fri, 11 Aug 2017 18:03:20 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgEHH-0002bi-Ow for xen-devel@lists.xen.org; Fri, 11 Aug 2017 18:03:19 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id 08/25-03937-761FD895; Fri, 11 Aug 2017 18:03:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTTftY2+ kwfy7qhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0brqtcsBYv5K761nmdvYFzI28XIxSEksJlR YsbrDYwQzmlGickTNzJ3MXJysAloStz5/IkJxBYRkJa49vkyI4jNLBAn8X5RIwuILSzgKvGnf woriM0ioCrx4vYlsHpeAUuJi+smgsUlBOQldrVdBLI5ODiB4nMuy4KEhQQsJLb/W8c2gZF7AS PDKkaN4tSistQiXWMDvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKRiveT83E2MQP8yAMEOxr9 rAw8xSnIwKYnyJvj0RgrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4I1/D5QTLEpNT61Iy8wBBhpM WoKDR0mEV+IDUJq3uCAxtzgzHSJ1ilGX49WE/9+YhFjy8vNSpcR5eUCKBECKMkrz4EbAgv4So 6yUMC8j0FFCPAWpRbmZJajyrxjFORiVhHlTQS7hycwrgdv0CugIJqAj+nzAjihJREhJNTC2zT c5u2c3pxz3zx3Nq9fc9ov44edd6ZDwXPhk2ZLaFO2iU/uP/PuUL//R+nPb7O5f52IXiQptuGr 8zW1h7b18EX+W20r7Uu5WHMvr+V3rp8A2+dy+cyci7Ksr/Mz4dq7vzlzAlXPWobfxcc/EFY7d +VPaPwfVRZQ/ORNqGabB533cMUdmTo4SS3FGoqEWc1FxIgDMpPZAdQIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1502474598!74420351!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 22997 invoked from network); 11 Aug 2017 18:03:18 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-11.tower-21.messagelabs.com with SMTP; 11 Aug 2017 18:03:18 -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 E2F1B164F; Fri, 11 Aug 2017 11:03:17 -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 F2DE83F577; Fri, 11 Aug 2017 11:03:16 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 11 Aug 2017 19:02:56 +0100 Message-Id: <20170811180257.5493-11-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170811180257.5493-1-julien.grall@arm.com> References: <20170811180257.5493-1-julien.grall@arm.com> Cc: bhupinder.thakur@linaro.org, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH 10/11] 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 --- 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 855ded1b07..9eacb1be29 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