[Xen-changelog] [xen master] xen/arm: Move out of processor.h traps related variable/function

[p***@xen.org]

commit fcb5b9f6c3c8861fcdd850a198fbd285206e64e4
Author: Julien Grall <***@arm.com>
AuthorDate: Wed Oct 31 18:13:03 2018 +0000
Commit: Stefano Stabellini <***@kernel.org>
CommitDate: Fri Nov 9 10:14:34 2018 -0800

xen/arm: Move out of processor.h traps related variable/function

do_unexpected_traps() is moved to traps.h while init_traps() and
hyp_traps_vectors() are moved to setup.h.

Signed-off-by: Julien Grall <***@arm.com>
Reviewed-by: Andrii Anisov <***@epam.com>
Acked-by: Stefano Stabellini <***@kernel.org>
---
xen/include/asm-arm/processor.h | 7 -------
xen/include/asm-arm/setup.h | 3 +++
xen/include/asm-arm/traps.h | 3 +++
3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h
index b64ea4e8e4..72ddc42778 100644
--- a/xen/include/asm-arm/processor.h
+++ b/xen/include/asm-arm/processor.h
@@ -453,10 +453,6 @@ extern register_t __cpu_logical_map[];
#endif

#ifndef __ASSEMBLY__
-extern uint32_t hyp_traps_vector[];
-
-void init_traps(void);
-
void panic_PAR(uint64_t par);

void show_execution_state(const struct cpu_user_regs *regs);
@@ -470,9 +466,6 @@ void show_registers(const struct cpu_user_regs *regs);
#define cpu_to_core(_cpu) (0)
#define cpu_to_socket(_cpu) (0)

-void noreturn do_unexpected_trap(const char *msg,
- const struct cpu_user_regs *regs);
-
struct vcpu;
void vcpu_regs_hyp_to_user(const struct vcpu *vcpu,
struct vcpu_guest_core_regs *regs);
diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
index 5f41ba0cba..11e1b2aacf 100644
--- a/xen/include/asm-arm/setup.h
+++ b/xen/include/asm-arm/setup.h
@@ -83,6 +83,9 @@ struct bootmodule *add_boot_module(bootmodule_kind kind,
struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind);
const char *boot_module_kind_as_string(bootmodule_kind kind);

+extern uint32_t hyp_traps_vector[];
+void init_traps(void);
+
#endif
/*
* Local variables:
diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h
index 589fba9cd0..6d8a43a691 100644
--- a/xen/include/asm-arm/traps.h
+++ b/xen/include/asm-arm/traps.h
@@ -46,6 +46,9 @@ void do_trap_hvc_smccc(struct cpu_user_regs *regs);

int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc);

+void noreturn do_unexpected_trap(const char *msg,
+ const struct cpu_user_regs *regs);
+
/* Functions for pending virtual abort checking window. */
void abort_guest_exit_start(void);
void abort_guest_exit_end(void);
--
generated by git-patchbot for /home/xen/git/xen.git#master