From: Zhang, X. <xia...@in...> - 2008-02-01 09:35:27
|
From: Xiantao Zhang <xia...@in...> Date: Fri, 1 Feb 2008 17:18:03 +0800 Subject: [PATCH] Make non-x86 arch partially support make sync. Make non-x86 arch partially support make sync, and other archs can get right header files for userspace. Signed-off-by: Xiantao Zhang <xia...@in...> --- kernel/Makefile | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 7a435b5..2f0d7d5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -13,6 +13,17 @@ LINUX =3D ../linux-2.6 =20 version =3D $(shell cd $(LINUX); git describe) =20 +ARCH :=3D $(shell uname -m | sed -e s/i.86/i386/) +SRCARCH :=3D $(ARCH) + +# Additional ARCH settings for x86 +ifeq ($(ARCH),i386) + SRCARCH :=3D x86 +endif +ifeq ($(ARCH),x86_64) + SRCARCH :=3D x86 +endif + _hack =3D mv $1 $1.orig && \ gawk -v version=3D$(version) -f hack-module.awk $1.orig \ | sed '/\#include/! s/\blapic\b/l_apic/g' > $1 && rm $1.orig @@ -30,14 +41,15 @@ all:: sync: rm -rf tmp rsync --exclude=3D'*.mod.c' -R \ - "$(LINUX)"/arch/x86/kvm/./*.[ch] \ + "$(LINUX)"/arch/$(SRCARCH)/kvm/./*.[cSh] \ "$(LINUX)"/virt/kvm/./*.[ch] \ "$(LINUX)"/./include/linux/kvm*.h \ - "$(LINUX)"/./include/asm-x86/kvm*.h \ + "$(LINUX)"/./include/asm-$(SRCARCH)/kvm*.h \ tmp/ rm -rf include/asm - ln -s asm-x86 include/asm + ln -s asm-$(SRCARCH) include/asm =20 +ifeq ($(SRCARCH),x86) $(call unifdef, include/linux/kvm.h) $(call unifdef, include/linux/kvm_para.h) $(call unifdef, include/asm-x86/kvm.h) @@ -48,6 +60,7 @@ sync: $(call hack, svm.c) $(call hack, x86.c) $(call hack, irq.h) +endif for i in $$(find tmp -type f -printf '%P '); \ do cmp -s $$i tmp/$$i || cp tmp/$$i $$i; done rm -rf tmp --=20 1.5.2 |