From patchwork Thu Oct 18 13:20:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 149134 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1972765lji; Thu, 18 Oct 2018 06:23:29 -0700 (PDT) X-Google-Smtp-Source: ACcGV63Mz4agMDh7nPjwRY67ksOaBpNuWG1otwblOYxaVsWb46GOGgK8omOUDf5RrfaqZLaBouCr X-Received: by 2002:a81:a492:: with SMTP id b140-v6mr18570303ywh.77.1539869009464; Thu, 18 Oct 2018 06:23:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539869009; cv=none; d=google.com; s=arc-20160816; b=V8sXPMIiqWdOmuj24D6l6mABC7FLno3EghmAAfjaIrSnpsXW/75pKtauLg/f5O6GPa JaBBOxQjATh5WDfPoniQ80SuSkd8Pv3vT6NDDLjy68Su+HtSxGT+7XaVQd60BUPA2ZOp tOsT4pZtB6EYutjQGVF3yKxHilSg5f8z+P4A71GyChzzkFOpLipg0SJkOb6rl+tkQ7rI DKTS4Jb4MA3wGn/M7Fd9Kc00GuPFjnCsbjM0cB0K0PcKq5hfzvc07IcDQNV0rLncLCAw e8aD6s0wEbC1QEQBsKVXF/31aMFIYaC+NbG8MK+N5RzwgTtNl61Z7lPYXkK5nmyzYLJ2 v1dA== 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:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=fFJB722LapD+m0bpiL6xHBda8iYnXY7zcgS7bGhcKR0=; b=YcDXkFUFmAs3UDmOdjgvHkHT74BKSkApi4NsyeQ5raFeAWntNiTubYnIkLUGNehFIt Wj4QNu85Um4Ea5JEw22cakF98OUBNpGZ1g0274tVndVE/DWAiYIIWPXraV8wk+XFgFgM 01uJpUNgJmhnZ92CkAl+p6JOVPRqCB76cB/vKzrsCFTRfTxVGQWIRx1rmTJAWSfpU4bz u93xl19h/+msvr2Z0ro72mWnn+5ZottI3NAXMYp/pHSPCiQW+z6qzwG8CGETDE0/oLoh SH5eaFco4K+tLGp8Vc8VL286442vY7ytHPi9OZs4d4LUOJuAECI7GiUJUH/Qo0k4afaF HFIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@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.google.com with ESMTPS id v11-v6si8077613ywe.217.2018.10.18.06.23.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 06:23:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gD8Eu-0002zv-5c; Thu, 18 Oct 2018 13:21:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gD8Es-0002za-QE for xen-devel@lists.xen.org; Thu, 18 Oct 2018 13:21:22 +0000 X-Inumbo-ID: e70561a2-d2d8-11e8-a6a9-d7ebe60f679a Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id e70561a2-d2d8-11e8-a6a9-d7ebe60f679a; Thu, 18 Oct 2018 13:22:46 +0000 (UTC) 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 1E9721596; Thu, 18 Oct 2018 06:21:21 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 56BA93F59C; Thu, 18 Oct 2018 06:21:20 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 18 Oct 2018 14:20:51 +0100 Message-Id: <20181018132109.31192-5-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181018132109.31192-1-julien.grall@arm.com> References: <20181018132109.31192-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 04/22] xen/arm: bugs: Move do_bug_frame to traps.h X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , sstabellini@kernel.org MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" do_bug_frame is only necessary when trapping. This allows to remove processor.h include. However, time.h was missing an include resulting to compilation error if processor.h is removed from bug.h. Signed-off-by: Julien Grall Reviewed-by: Andrii Anisov --- xen/arch/arm/arm32/traps.c | 1 + xen/include/asm-arm/bug.h | 4 ---- xen/include/asm-arm/time.h | 2 ++ xen/include/asm-arm/traps.h | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index 4f27543dec..76f714a168 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -22,6 +22,7 @@ #include #include +#include void do_trap_reset(struct cpu_user_regs *regs) { diff --git a/xen/include/asm-arm/bug.h b/xen/include/asm-arm/bug.h index 4704e2d858..36c803357c 100644 --- a/xen/include/asm-arm/bug.h +++ b/xen/include/asm-arm/bug.h @@ -1,8 +1,6 @@ #ifndef __ARM_BUG_H__ #define __ARM_BUG_H__ -#include - #if defined(CONFIG_ARM_32) # include #elif defined(CONFIG_ARM_64) @@ -77,8 +75,6 @@ extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_1[], __stop_bug_frames_2[]; -int do_bug_frame(struct cpu_user_regs *regs, vaddr_t pc); - #endif /* __ARM_BUG_H__ */ /* * Local variables: diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 19a4515e72..ea88e76304 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -1,6 +1,8 @@ #ifndef __ARM_TIME_H__ #define __ARM_TIME_H__ +#include + #define DT_MATCH_TIMER \ DT_MATCH_COMPATIBLE("arm,armv7-timer"), \ DT_MATCH_COMPATIBLE("arm,armv8-timer") diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index 70b52d1d16..059aa370c3 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -43,6 +43,8 @@ void do_cp(struct cpu_user_regs *regs, const union hsr hsr); void do_trap_smc(struct cpu_user_regs *regs, const union hsr hsr); void do_trap_hvc_smccc(struct cpu_user_regs *regs); +int do_bug_frame(struct cpu_user_regs *regs, vaddr_t pc); + #endif /* __ASM_ARM_TRAPS__ */ /* * Local variables: