From patchwork Thu Sep 14 17:08:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112584 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1002797qgf; Thu, 14 Sep 2017 10:11:20 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDo5afH4lYRk15S8w7KFWSg1EIXDj1tC/jGjC/vAOuUr5JDLZaUyeHfoSF4QBjjrKJe9lW7 X-Received: by 10.36.39.199 with SMTP id g190mr1239394ita.73.1505409080819; Thu, 14 Sep 2017 10:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505409080; cv=none; d=google.com; s=arc-20160816; b=0AVxeO6v2O8bA1f5FtgbmY1kLvUYst4QSlG56d/+2nBpzn1F5/uf94WGtl8kDAtKzb JOWfiybFTRppAIIZcJIkaDsoEP3j7ryKr4S+4ByWFs0LsFZ4lrFQgCl4MeR4Zn2ydIRP 170kDY1mVEXptH3nysTdTuBlvKxFpCnbFIC4HA+7XcQWi6GmSU15L9qb7R7/fewxntQa rIfdfEKxL2KKw0HUnrlJ0Ib1zGMh/SBhXpa4/EqtCQeqnwQRPd++23CBBhai1kp66G8V ro1VjdOTUqn/nWWoxkRdM01sQ/omjmUMkz4YolA16CJ2pYMA+tEbCx7yvHW1A8/n/HAM lrWQ== 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=ZzwxnQ3pN5A7wxONIgHi+8hj4DoR4Fko2qlOPVjlxT0=; b=S7tYeogJbmL6P93oqOXKhIFPln8+WjQ3Zh/iX7dwB5rEm78I+Kb7Io5udvyhQEGH0B GaZjcryo+VWA8NsLyeybYcYmIPxY1JeUVQ3u6KZ0fI3bBODFdONZYpKuUJ25Qghsscqm CqIkaXUWGTzmF9dngKwtvy/t7TG8CqTWYYtBvxP9/lh9MhPX2NUuIVEDRz/tgfRfRhBN ELVqbB7mKuVp/DdWT1UX5ckmYgsXZoKl5VoDcjo+CcOIG7E8eJmPE8Jjc2WmiviXwc/3 4heTdIQWDXNrKZp+kQNicnz5wxT63ePm/KBCwBXyjiPmB+k7IhwB1vg3JzAvRgatm9NM Qg4Q== 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 n23si15462904iod.141.2017.09.14.10.11.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Sep 2017 10:11:20 -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 1dsXda-0008EA-83; Thu, 14 Sep 2017 17:09:14 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dsXdY-0008Cr-PY for xen-devel@lists.xen.org; Thu, 14 Sep 2017 17:09:12 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 2D/85-03454-8B7BAB95; Thu, 14 Sep 2017 17:09:12 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTXf79l2 RBtNvqFss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBltVyoKZgpUdC24wtjA+Je3i5GLQ0hgM6PE 7SMXmLoYOYGc04wSH0/bg9hsApoSdz5/AouLCEhLXPt8mRHEZhaIk3i/qJEFxBYWcJNo/HGWD cRmEVCV6Pn9CCzOK2Ap8fJfHzOILSEgL7Gr7SIriM0pYCWx+/cVZohdlhK77nxln8DIvYCRYR WjRnFqUVlqka6xgV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4mRqB3GYBgB+PftYG HGCU5mJREeffq7owU4kvKT6nMSCzOiC8qzUktPsQow8GhJMF7Y9uuSCHBotT01Iq0zBxgmMGk JTh4lER480DSvMUFibnFmekQqVOMuhwdN+/+YRJiycvPS5US560DKRIAKcoozYMbAQv5S4yyU sK8jEBHCfEUpBblZpagyr9iFOdgVBLm3QQyhSczrwRu0yugI5iAjjhzegfIESWJCCmpBkatJ9 5BZZH12/q2zz78Mf3WKe1LUw5yNykzmr2Kvdtzv3D5ZY2uOrX4qM9Ty6b0y/lkBmQzX388MfH phndTz1RPaGEXnDJ7/2U7k8Lmw7OF+cMXLD1Z0sbYm/6l60JkUdUkp2SJ+EkTXu+3m3I/IuWu YMWB/Nm6GpzrewpDkqxuJvyJLvLiz1NiKc5INNRiLipOBADHaXKVdAIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1505408951!82766513!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 40260 invoked from network); 14 Sep 2017 17:09:11 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-21.messagelabs.com with SMTP; 14 Sep 2017 17:09:11 -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 E8F4D16A0; Thu, 14 Sep 2017 10:09:10 -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 0689D3F483; Thu, 14 Sep 2017 10:09:09 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 14 Sep 2017 18:08:58 +0100 Message-Id: <20170914170859.30553-5-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170914170859.30553-1-julien.grall@arm.com> References: <20170914170859.30553-1-julien.grall@arm.com> Cc: bhupinder.thakur@linaro.org, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 4/5] 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 --- Changes in v3: - Add Stefano's reviewed-by --- 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