driver: Use hypervisor's version.h

Let the driver module depend on the hypervisor subdir. This allows us to
reuse the version.h generated by the hypervisor build also for the
driver. They were identical.

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

diff --git a/.gitignore b/.gitignore
index 15a005357f8b61cc0ba8377af9a265901d8defbb..7d85df81b401171ef72e614b9f6853d53b59d7d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 Module.symvers
 modules.order
 jailhouse.ko
-jailhouse-version.h
 hypervisor/include/jailhouse/config.h
 hypervisor/include/jailhouse/version.h
 hypervisor/hypervisor.lds

diff --git a/Kbuild b/Kbuild
index 9563aaafc07ff7101350e6ac16db960c9bddc8a6..b865b8747dbbd1a24a10f99fa393bd753871f68b 100644 (file)
--- a/Kbuild
+++ b/Kbuild
@@ -5,7 +5,7 @@
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
-#  Banjmin Block <bebl@mageta.org>
+#  Benjamin Block <bebl@mageta.org>
 #
 # This work is licensed under the terms of the GNU GPL, version 2.  See
 # the COPYING file in the top-level directory.
@@ -20,13 +20,4 @@ ccflags-y := -I$(src)/hypervisor/arch/$(SRCARCH)/include \
 
 jailhouse-y := driver.o
 
-define filechk_version
-       $(src)/scripts/gen_version_h $(src)
-endef
-
-clean-files := jailhouse-version.h
-
-$(obj)/jailhouse-version.h: $(src)/Makefile FORCE
-       $(call filechk,version)
-
-$(obj)/driver.o: $(obj)/jailhouse-version.h
+$(obj)/driver.o: $(obj)/hypervisor

diff --git a/driver.c b/driver.c
index 983764a1fbf37fef8ef367cc919a1cff9a3b5cfe..d7d13f560c5b3355bec4f2bdf6aed2885b4b9544 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -28,10 +28,10 @@
 #include <asm/cacheflush.h>
 
 #include "jailhouse.h"
-#include "jailhouse-version.h"
 #include <jailhouse/cell-config.h>
 #include <jailhouse/header.h>
 #include <jailhouse/hypercall.h>
+#include <jailhouse/version.h>
 
 #ifdef CONFIG_X86_32
 #error 64-bit kernel required!