xen/arm: Move arch/arm/vtimer.h to include/asm-arm/vtimer.h

It will be necessary to include vtimer.h from subdirectory making the
inclusion a bit awkward.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>

diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 6512f01463a8df2b22423fea96dfddf323d37fd4..784ae392cf9ebcb3cb118a41049a5a7ec4e587a4 100644 (file)
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -33,8 +33,8 @@
 #include <asm/regs.h>
 #include <asm/vfp.h>
 #include <asm/vgic.h>
+#include <asm/vtimer.h>
 
-#include "vtimer.h"
 #include "vuart.h"
 
 DEFINE_PER_CPU(struct vcpu *, curr_vcpu);

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 6b3dfd9bcf7ec38cf3a26d5d018642e0e448af1b..6f32f700e5e7b1232ab8bb23f9c10a75f242f15d 100644 (file)
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -50,9 +50,9 @@
 #include <asm/psci.h>
 #include <asm/regs.h>
 #include <asm/vgic.h>
+#include <asm/vtimer.h>
 
 #include "decode.h"
-#include "vtimer.h"
 
 /* The base of the stack must always be double-word aligned, which means
  * that both the kernel half of struct cpu_user_regs (which is pushed in

diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h
deleted file mode 100644 (file)
index 5aaddc6..0000000
--- a/xen/arch/arm/vtimer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * xen/arch/arm/vtimer.h
- *
- * ARM Virtual Timer emulation support
- *
- * Ian Campbell <ian.campbell@citrix.com>
- * Copyright (c) 2011 Citrix Systems.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __ARCH_ARM_VTIMER_H__
-#define __ARCH_ARM_VTIMER_H__
-
-extern int domain_vtimer_init(struct domain *d,
-                              struct xen_arch_domainconfig *config);
-extern int vcpu_vtimer_init(struct vcpu *v);
-extern bool vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr);
-extern int virt_timer_save(struct vcpu *v);
-extern int virt_timer_restore(struct vcpu *v);
-extern void vcpu_timer_destroy(struct vcpu *v);
-
-#endif
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- */

diff --git a/xen/include/asm-arm/vtimer.h b/xen/include/asm-arm/vtimer.h
new file mode 100644 (file)
index 0000000..5aaddc6
--- /dev/null
+++ b/xen/include/asm-arm/vtimer.h
@@ -0,0 +1,40 @@
+/*
+ * xen/arch/arm/vtimer.h
+ *
+ * ARM Virtual Timer emulation support
+ *
+ * Ian Campbell <ian.campbell@citrix.com>
+ * Copyright (c) 2011 Citrix Systems.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __ARCH_ARM_VTIMER_H__
+#define __ARCH_ARM_VTIMER_H__
+
+extern int domain_vtimer_init(struct domain *d,
+                              struct xen_arch_domainconfig *config);
+extern int vcpu_vtimer_init(struct vcpu *v);
+extern bool vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr);
+extern int virt_timer_save(struct vcpu *v);
+extern int virt_timer_restore(struct vcpu *v);
+extern void vcpu_timer_destroy(struct vcpu *v);
+
+#endif
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */