Avi,
Please drop the previous one due to its incompleteness, and help to
check-in this one.
Xiantao
>From ae0e1b37520f6aba051b5ebb47028520383ca494 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
Date: Thu, 21 Aug 2008 17:30:32 +0800
Subject: [PATCH] KVM: Userspace: Make " make sync" get correct header
files with latest Linux source.
In latest linux repo, ia64, s390 and other archs moved header files from
$(LINUX)/include/asm-$(ARCH)/ to $(LINUX)/arch/$(ARCH)/include/asm/, so
this
patch adds the compatibility for new source structure.
Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
kernel/Makefile | 5 ++++-
kernel/ia64/Makefile.pre | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index e5f43a2..6f8cc9d 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -36,7 +36,7 @@ hack-files = $(hack-files-$(ARCH_DIR))
all:: header-link prerequisite
# include header priority 1) $LINUX 2) $KERNELDIR 3)
include-compat
$(MAKE) -C $(KERNELDIR) M=`pwd` \
- LINUXINCLUDE="-I`pwd`/include -Iinclude
-I`pwd`/include-compat \
+ LINUXINCLUDE="-I`pwd`/include -Iinclude
-Iarch/${ARCH_DIR}/include -I`pwd`/include-compat \
-include include/linux/autoconf.h \
-include `pwd`/$(ARCH_DIR)/external-module-compat.h"
"$$@"
@@ -56,6 +56,9 @@ header-sync:
"$(LINUX)"/./include/linux/kvm*.h \
"$(LINUX)"/./include/asm-*/kvm*.h \
$T/
+ -rsync -R \
+ "$(LINUX)"/arch/$(ARCH_DIR)/include/asm/./kvm*.h \
+ $T/include/asm-$(ARCH_DIR)/
set -e && for i in $(find $T -name '*.h'); do \
$(call unifdef,$$i); done
diff --git a/kernel/ia64/Makefile.pre b/kernel/ia64/Makefile.pre
index 033bdee..c55ea0f 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -20,4 +20,4 @@ asm-offsets.h: asm-offsets.s
echo "#endif") <$< >$@
asm-offsets.s: ia64/asm-offsets.c
- gcc -S -D__KERNEL__ -I$(KERNELDIR)/include -I./include
ia64/asm-offsets.c
+ gcc -S -D__KERNEL__ -I$(KERNELDIR)/include
-I$(KERNELDIR)/arch/ia64/include -I./include ia64/asm-offsets.c
--
1.5.1
Attachment:
0001-KVM-Userspace-Make-make-sync-get-correct-header.patch
Description: 0001-KVM-Userspace-Make-make-sync-get-correct-header.patch
