core: Restrict asm/ivshmem.h to inclusion by jailhouse/ivshmem.h

The asm header will gain a dependency on the generic one and, thus, should no longer be considered for direct inclusion. Adjust the header check accordingly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
siemens · Jan 14, 2017 · c219a31 · c219a31
1 parent 02a1acb
commit c219a31
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/hypervisor/arch/arm-common/include/asm/ivshmem.h b/hypervisor/arch/arm-common/include/asm/ivshmem.h
@@ -10,11 +10,6 @@
  * the COPYING file in the top-level directory.
  */
 
-#ifndef _JAILHOUSE_ASM_IVSHMEM_H
-#define _JAILHOUSE_ASM_IVSHMEM_H
-
 struct arch_pci_ivshmem {
 	u16 irq_id;
 };
-
-#endif /* !_JAILHOUSE_ASM_IVSHMEM_H */
diff --git a/hypervisor/arch/x86/include/asm/ivshmem.h b/hypervisor/arch/x86/include/asm/ivshmem.h
@@ -10,13 +10,8 @@
  * the COPYING file in the top-level directory.
  */
 
-#ifndef _JAILHOUSE_ASM_IVSHMEM_H
-#define _JAILHOUSE_ASM_IVSHMEM_H
-
 #include <asm/apic.h>
 
 struct arch_pci_ivshmem {
 	struct apic_irq_message irq_msg;
 };
-
-#endif /* !_JAILHOUSE_ASM_IVSHMEM_H */
diff --git a/scripts/header_check b/scripts/header_check
@@ -38,6 +38,11 @@ test_compile()
 		prepend="#define __ASSEMBLY__
 			 #include <jailhouse/types.h>"
 		;;
+	ivshmem.h)
+		if [ "$1" == "asm" ]; then
+			# must be included by jailhouse/ivshmem.h only
+			return
+		fi
 	esac
 
 	echo "$prepend" > .header_check.tmp.c