[PATCH] core: Clean up asm/bitops.h inclusions

1 view
Skip to first unread message

Jan Kiszka

unread,
Aug 19, 2015, 6:29:22 PM8/19/15
to Jailhouse, Antonios Motakis
No asm/spinlock.h header needs it anymore. If we remove it, we need to
convert the implicit inclusion in arm/mmio.c into an explicit one.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

This depends on http://thread.gmane.org/gmane.linux.jailhouse/3515.

hypervisor/arch/arm/include/asm/spinlock.h | 1 -
hypervisor/arch/arm/mmio.c | 1 +
hypervisor/arch/x86/include/asm/spinlock.h | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hypervisor/arch/arm/include/asm/spinlock.h b/hypervisor/arch/arm/include/asm/spinlock.h
index bee4e40..983d51c 100644
--- a/hypervisor/arch/arm/include/asm/spinlock.h
+++ b/hypervisor/arch/arm/include/asm/spinlock.h
@@ -14,7 +14,6 @@
#ifndef _JAILHOUSE_ASM_SPINLOCK_H
#define _JAILHOUSE_ASM_SPINLOCK_H

-#include <asm/bitops.h>
#include <asm/processor.h>

#ifndef __ASSEMBLY__
diff --git a/hypervisor/arch/arm/mmio.c b/hypervisor/arch/arm/mmio.c
index 61f2adc..c12cf5f 100644
--- a/hypervisor/arch/arm/mmio.c
+++ b/hypervisor/arch/arm/mmio.c
@@ -11,6 +11,7 @@
*/

#include <jailhouse/mmio.h>
+#include <asm/bitops.h>
#include <asm/irqchip.h>
#include <asm/processor.h>
#include <asm/smp.h>
diff --git a/hypervisor/arch/x86/include/asm/spinlock.h b/hypervisor/arch/x86/include/asm/spinlock.h
index cefb46c..8ca5638 100644
--- a/hypervisor/arch/x86/include/asm/spinlock.h
+++ b/hypervisor/arch/x86/include/asm/spinlock.h
@@ -17,7 +17,6 @@
#ifndef _JAILHOUSE_ASM_SPINLOCK_H
#define _JAILHOUSE_ASM_SPINLOCK_H

-#include <asm/bitops.h>
#include <asm/processor.h>

typedef struct {
--
2.1.4
Reply all
Reply to author
Forward
0 new messages