[PATCH] Fix build issue for IA64

[Zhang, Xiantao]

>From 40df689b23263ffe2f2efed9950700d42f985b29 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <[EMAIL PROTECTED]>
Date: Tue, 12 Aug 2008 08:15:10 +0800
Subject: [PATCH] KVM:Userspace: Fix build issue for IA64.

1. Generating asm-offset.h @ build time with host kernel
2. "Make -C user" doesn't support for ia64 now.
Signed-off-by: Xiantao Zhang <[EMAIL PROTECTED]>
---
 kernel/Makefile          |    4 ++--
 kernel/ia64/Makefile.pre |    6 +++---
 kvm.spec                 |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 0d5d148..e5f43a2 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 484fe80..033bdee 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
diff --git a/kvm.spec b/kvm.spec
index 92acb0e..f6ae869 100644
--- a/kvm.spec
+++ b/kvm.spec
@@ -81,8 +81,8 @@ rm -rf %{buildroot}
 cd ..
 ./configure --prefix=/usr/kvm %{qemuldflags}
 make -C libkvm
-make -C user
 %ifarch i386 x86_64
+make -C user
 make extboot
 %endif
 #(cd qemu;
-- 
1.5.1

0001-KVM-Userspace-Fix-build-issue-for-IA64.patch
Description: 0001-KVM-Userspace-Fix-build-issue-for-IA64.patch