From patchwork Wed Oct 31 18:12:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 149861 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7127280ljp; Wed, 31 Oct 2018 11:16:15 -0700 (PDT) X-Google-Smtp-Source: AJdET5dhw4H76DP40dkuviUSWf1GvaY+3vs+ot1DtQLfJJWSNhLKVHy6qBaYjHSpFOfFCbqysLhr X-Received: by 2002:a81:32d3:: with SMTP id y202-v6mr4199343ywy.55.1541009775199; Wed, 31 Oct 2018 11:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541009775; cv=none; d=google.com; s=arc-20160816; b=OW+1GXCZtCmzgTWZeAGRzIgGvs4JIot0ALCyZhQZ2ttGA40SnkL9FP6drP+CpG9Sm/ knMYvjJT+cHw9LsX8jMkd4BFFo6VY9a1rlaa8Kyy/ehwBG9cS8Bh3wqvko2nGeDQ3W2O 3NUE0wTJkIcQfevYWIBhJDLsetOswlHh+pKFvo4Za1eUQmPzqbSYs//DU3BYstdhC2Xk 4W45nMYiVQfTF1EaJGwjkbls7Z/D4yn/jPYAiPZILdYLaBpw0JthxM9u97cLa16lT3Yt lPO8FUw0RCynbeGHonqB1mEK13QjGz7P8+TWTFX+bB4rALo+D2CMrXsGcGQin4EeYe0c jdfQ== 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=Mb1LpLKhCKPpfEkySOTXVBBPMJXTlWVlhLPvTWo+5UE=; b=bxwIlb7CuaweJ5ADam58+sLIj6w5A+jfhCIVyoMBCD0w95zNXr61vJU3dEoEqFwIbp JU94Ctz/y7LzjXbqXWXd/nHoaREV03Vmhtb2sIKzeScPBZzwkmmv3z5HgpfGosrtuqLT H6bN9tBzVQqITSNEFbvMyCG073t8/tn0003WOiToU4tmgw9Ng8v/nqnX1DO3g7jbqy32 2B51qi5t53VzJ2CMEcHNMecvZu2H3zW+CaPqk7sPxnjKHi3S6BEunT7dZUWrOmoTQRxw 4ovUzhQnY9XrTnJvB1/K8LP5e3c4Dj6ybKn0OVoTcj0HtthKapjZigu4PMwoei9pozFQ JY9A== 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 s5-v6si16976166ywe.116.2018.10.31.11.16.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 11:16:15 -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 1gHuze-0004Nf-So; Wed, 31 Oct 2018 18:13:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gHuzd-0004NO-NN for xen-devel@lists.xen.org; Wed, 31 Oct 2018 18:13:25 +0000 X-Inumbo-ID: a88fb602-dd38-11e8-adaf-12d6303a7972 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id a88fb602-dd38-11e8-adaf-12d6303a7972; Wed, 31 Oct 2018 18:13:25 +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 A5CAC80D; Wed, 31 Oct 2018 11:13:24 -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 BA7683F6A8; Wed, 31 Oct 2018 11:13:23 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 31 Oct 2018 18:12:56 +0000 Message-Id: <20181031181313.8028-5-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181031181313.8028-1-julien.grall@arm.com> References: <20181031181313.8028-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 04/21] 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, andrii_anisov@epam.com 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 --- Changes in v2: - Rebase - Add Andrii's reviewed-by --- 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 90a59c972b..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(const 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..d30ee1e01e 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(const struct cpu_user_regs *regs, vaddr_t pc); + #endif /* __ASM_ARM_TRAPS__ */ /* * Local variables: