[PATCH 21/21] arm: Remove some unneeded includes

1 view
Skip to first unread message

Jan Kiszka

unread,
Sep 29, 2016, 4:22:49 PM9/29/16
to jailho...@googlegroups.com
Those are either not used or basic includes that come in implicitly.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
hypervisor/arch/arm/control.c | 3 ---
hypervisor/arch/arm/include/asm/setup.h | 2 --
hypervisor/arch/arm/lib.c | 3 ---
hypervisor/arch/arm/setup.c | 2 --
4 files changed, 10 deletions(-)

diff --git a/hypervisor/arch/arm/control.c b/hypervisor/arch/arm/control.c
index 0ad05a2..e9ba82d 100644
--- a/hypervisor/arch/arm/control.c
+++ b/hypervisor/arch/arm/control.c
@@ -14,14 +14,11 @@

#include <jailhouse/control.h>
#include <jailhouse/printk.h>
-#include <jailhouse/processor.h>
#include <jailhouse/string.h>
#include <asm/control.h>
#include <asm/irqchip.h>
-#include <asm/processor.h>
#include <asm/smp.h>
#include <asm/sysregs.h>
-#include <asm/traps.h>

static void cpu_reset(void)
{
diff --git a/hypervisor/arch/arm/include/asm/setup.h b/hypervisor/arch/arm/include/asm/setup.h
index f8d3aea..f555e4d 100644
--- a/hypervisor/arch/arm/include/asm/setup.h
+++ b/hypervisor/arch/arm/include/asm/setup.h
@@ -17,8 +17,6 @@

#ifndef __ASSEMBLY__

-#include <jailhouse/string.h>
-
static inline void __attribute__((always_inline))
cpu_prepare_return_el1(struct per_cpu *cpu_data, int return_code)
{
diff --git a/hypervisor/arch/arm/lib.c b/hypervisor/arch/arm/lib.c
index 2fdcbe6..7d7cd04 100644
--- a/hypervisor/arch/arm/lib.c
+++ b/hypervisor/arch/arm/lib.c
@@ -12,10 +12,7 @@

#include <jailhouse/control.h>
#include <jailhouse/processor.h>
-#include <jailhouse/string.h>
-#include <jailhouse/types.h>
#include <asm/control.h>
-#include <asm/percpu.h>
#include <asm/sysregs.h>

unsigned long phys_processor_id(void)
diff --git a/hypervisor/arch/arm/setup.c b/hypervisor/arch/arm/setup.c
index 8e9f54f..3e3fdbf 100644
--- a/hypervisor/arch/arm/setup.c
+++ b/hypervisor/arch/arm/setup.c
@@ -15,8 +15,6 @@
#include <jailhouse/processor.h>
#include <jailhouse/string.h>
#include <asm/control.h>
-#include <asm/irqchip.h>
-#include <asm/percpu.h>
#include <asm/setup.h>
#include <asm/smp.h>
#include <asm/sysregs.h>
--
2.1.4

Reply all
Reply to author
Forward
0 new messages