[PATCH] x86: Pick up local arch trace header (was: kvm-kmod 88 or git not working with 2.6.31)

[Jan Kiszka <jan.kiszka@web.de>]

[-- Attachment #1: Type: text/plain, Size: 2370 bytes --]

Aidan Marks wrote:
> Hello
> 
> I am trying to compile kvm-kmod-devel-88.tar.gz with 2.6.31.  Seems
> there is a missing header file.
> 
> 
> vger kvm-kmod-devel-88 # make
> 
> 
> make -C /lib/modules/2.6.31-gentoo/build M=`pwd` \
> 
> 
>                 LINUXINCLUDE="-I`pwd`/include -Iinclude \
> 
> 
>                  -Iarch/x86/include -I`pwd`/include-compat \
> 
> 
>                 -include include/linux/autoconf.h \
> 
> 
>                 -include `pwd`/x86/external-module-compat.h " \
> 
> 
>                 "$@"
> 
> 
> make[1]: Entering directory `/usr/src/linux-2.6.31-gentoo'
> 
> 
>   LD      /tmp/kvm-kmod-devel-88/x86/built-in.o
> 
> 
>   CC [M]  /tmp/kvm-kmod-devel-88/x86/svm.o
> 
> 
>   CC [M]  /tmp/kvm-kmod-devel-88/x86/vmx.o
> 
> 
>   CC [M]  /tmp/kvm-kmod-devel-88/x86/vmx-debug.o
> 
> 
>   CC [M]  /tmp/kvm-kmod-devel-88/x86/kvm_main.o
> 
> 
>   CC [M]  /tmp/kvm-kmod-devel-88/x86/x86.o
> 
> 
> In file included from /tmp/kvm-kmod-devel-88/x86/trace.h:355,
> 
> 
>                  from /tmp/kvm-kmod-devel-88/x86/x86.c:83:
> 
> 
> include/trace/define_trace.h:53:43: error: arch/x86/kvm/trace.h: No such
> file or directory
> 
> make[3]: *** [/tmp/kvm-kmod-devel-88/x86/x86.o] Error 1
> 
> 
> make[2]: *** [/tmp/kvm-kmod-devel-88/x86] Error 2
> 
> 
> make[1]: *** [_module_/tmp/kvm-kmod-devel-88] Error 2
> 
> 
> make[1]: Leaving directory `/usr/src/linux-2.6.31-gentoo'
> 
> 
> make: *** [all] Error 2
> 
> I also tried pulling from git via:
> 
> git clone git://git.kernel.org/pub/scm/virt/kvm/kvm-kmod.git
> cd kvm-kmod
> git submodule update --init
> ./configure --kerneldir=/usr/src/linux
> make sync
> make
> 
> still the same error.
> 
> is there a patch for 2.6.31 support?

This should fix it:

---------->

This unbreaks 2.6.31 builds but also ensures that we always use the most
recent one.

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

 include/arch/x86/kvm/trace.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 120000 include/arch/x86/kvm/trace.h

diff --git a/include/arch/x86/kvm/trace.h b/include/arch/x86/kvm/trace.h
new file mode 120000
index 0000000..170abca
--- /dev/null
+++ b/include/arch/x86/kvm/trace.h
@@ -0,0 +1 @@
+../../../../x86/trace.h
\ No newline at end of file


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]