From: awilliam@xenbuild.aw Date: Tue, 13 Jun 2006 18:12:24 +0000 (-0600) Subject: merge with xen-unstable.hg X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15972 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3d089e3ba139677d9af6593797d918cd9607714f;p=xen.git merge with xen-unstable.hg --- 3d089e3ba139677d9af6593797d918cd9607714f diff --cc linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre index ae1131c00a,afc6b542d4..877f354ad9 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre @@@ -10,8 -10,14 +10,3 @@@ #eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/ - #ia64 drivers/xen isn't fully functional yet, workaround... - #also ignore core/evtchn.c which uses a different irq mechanism than ia64 - #(warning: there be dragons here if these files diverge) - ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile - ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile -#not sure where these ia64-specific files will end up in the future -ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core - -#still a few x86-ism's in various drivers/xen files, patch them -#cd drivers/xen -#if [ ! -e ia64.patch.semaphore ] -#then -# cat ../../arch/ia64/xen/drivers/patches/* | patch -p1 -b -#fi -#touch ia64.patch.semaphore -#cd ../.. diff --cc linux-2.6-xen-sparse/arch/ia64/xen/drivers/README index 33aecaa2a8,33aecaa2a8..0000000000 deleted file mode 100644,100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/README +++ /dev/null @@@ -1,2 -1,2 +1,0 @@@ --This is a temporary location for source/Makefiles that need to be --patched/reworked in drivers/xen to work with xenlinux/ia64.