From c2229119284aa45805ff3fcf159ebfec156bd2a7 Mon Sep 17 00:00:00 2001 From: Xiantao Zhang Date: Tue, 12 Aug 2008 08:15:10 +0800 Subject: kvm: external module: generate asm-offsets.h for ia64 Generate asm-offset.h @ build time with host kernel. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity --- kernel/Makefile | 4 ++-- kernel/ia64/Makefile.pre | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 0d5d1488..e5f43a2e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -33,7 +33,7 @@ hack-files-ia64 = hack-files = $(hack-files-$(ARCH_DIR)) -all:: header-link +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 \ @@ -41,7 +41,7 @@ all:: header-link -include `pwd`/$(ARCH_DIR)/external-module-compat.h" "$$@" -sync: header-sync source-sync header-link prerequisite +sync: header-sync source-sync header-link header-link: rm -f include/asm diff --git a/kernel/ia64/Makefile.pre b/kernel/ia64/Makefile.pre index 484fe80e..033bdeee 100644 --- a/kernel/ia64/Makefile.pre +++ b/kernel/ia64/Makefile.pre @@ -1,6 +1,6 @@ prerequisite: asm-offsets.h ia64/memset.S ia64/memcpy.S - cp -f $(LINUX)/arch/ia64/lib/memcpy.S ia64/memcpy.S - cp -f $(LINUX)/arch/ia64/lib/memset.S ia64/memset.S + cp -f $(KERNELDIR)/arch/ia64/lib/memcpy.S ia64/memcpy.S + cp -f $(KERNELDIR)/arch/ia64/lib/memset.S ia64/memset.S cmp -s asm-offset.h ia64/asm-offset.h || mv -f asm-offsets.* ia64/ asm-offsets.h: asm-offsets.s @@ -20,4 +20,4 @@ asm-offsets.h: asm-offsets.s echo "#endif") <$< >$@ asm-offsets.s: ia64/asm-offsets.c - gcc -S -D__KERNEL__ -I$(LINUX)/include -I./include ia64/asm-offsets.c + gcc -S -D__KERNEL__ -I$(KERNELDIR)/include -I./include ia64/asm-offsets.c -- cgit v1.2.3