Aron Griffis
2006-May-24 23:58 UTC
[Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre
This patch takes a bite out of xen-mkbuildtree-pre, which needs to disappear eventually for inclusion of xen-ia64 in Fedora. Probably these config settings will disappear when the ia64 p2m/vp conversion is complete, but for the moment it''s a clean way of handling the two personalities of xen-ia64. This is sent to xen-devel because it''s primarily common code that''s changing. Signed-off-by: Aron Griffis <aron@hp.com> # HG changeset patch # User agriffis@cougar.zko.hp.com # Node ID cf12cea74afd06dedb2ac4e539b2570950e29690 # Parent 35f2341bfac8bb74ad2ca7e7f71f6c0663bb3e36 Converge the ia64-specific and general versions of xen/drivers/Makefile and xen/drivers/core/Makefile. Use Kconfig settings instead to control whether specific pieces are built. diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/arch/ia64/Kconfig --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig Wed May 24 19:58:43 2006 -0400 @@ -496,15 +496,31 @@ source "security/Kconfig" source "crypto/Kconfig" +# # override default values of drivers/xen/Kconfig -if !XEN_IA64_DOM0_VP +# +config XEN_UTIL + default n if XEN_IA64_DOM0_VP + config HAVE_ARCH_ALLOC_SKB - bool - default n + default n if !XEN_IA64_DOM0_VP config HAVE_ARCH_DEV_ALLOC_SKB - bool - default n -endif + default n if !XEN_IA64_DOM0_VP + +config XEN_NETUTIL + default n if !XEN_IA64_DOM0_VP + +config XEN_BALLOON + default n if !XEN_IA64_DOM0_VP + +config XEN_SKBUFF + default n if !XEN_IA64_DOM0_VP + +config XEN_CHAR + default n + +config XEN_REBOOT + default n source "drivers/xen/Kconfig" diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Wed May 24 19:58:43 2006 -0400 @@ -9,12 +9,6 @@ #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 diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/drivers/xen/Kconfig --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig Wed May 24 19:58:43 2006 -0400 @@ -228,4 +228,29 @@ config NO_IDLE_HZ bool default y +config XEN_UTIL + bool + default y + +config XEN_NETUTIL + bool + default y + +config XEN_BALLOON + bool + default y + +config XEN_CHAR + bool + default y + +config XEN_SKBUFF + bool + default y + depends on NET + +config XEN_REBOOT + bool + default y + endif diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/drivers/xen/Makefile --- a/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 19:58:43 2006 -0400 @@ -1,15 +1,13 @@ - -obj-y += net_driver_util.o -obj-y += util.o - obj-y += core/ -obj-y += char/ obj-y += console/ obj-y += evtchn/ -obj-y += balloon/ obj-y += privcmd/ obj-y += xenbus/ +obj-$(CONFIG_XEN_UTIL) += util.o +obj-$(CONFIG_XEN_NETUTIL) += net_driver_util.o +obj-$(CONFIG_XEN_BALLOON) += balloon/ +obj-$(CONFIG_XEN_CHAR) += char/ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/ obj-$(CONFIG_XEN_NETDEV_BACKEND) += netback/ obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmback/ diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/drivers/xen/core/Makefile --- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile Wed May 24 19:58:43 2006 -0400 @@ -2,10 +2,12 @@ # Makefile for the linux kernel. # -obj-y := evtchn.o reboot.o gnttab.o features.o +obj-y := evtchn.o gnttab.o features.o -obj-$(CONFIG_PROC_FS) += xen_proc.o -obj-$(CONFIG_NET) += skbuff.o -obj-$(CONFIG_SMP) += smpboot.o -obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o +obj-$(CONFIG_PROC_FS) += xen_proc.o +obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o +obj-$(CONFIG_IA64) += xenia64_init.o +obj-$(CONFIG_XEN_SKBUFF) += skbuff.o +obj-$(CONFIG_XEN_REBOOT) += reboot.o +obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/arch/ia64/xen/drivers/Makefile --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/Makefile Wed May 24 09:59:04 2006 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - -ifneq ($(CONFIG_XEN_IA64_DOM0_VP),y) -obj-y += util.o -endif -obj-$(CONFIG_XEN_IA64_DOM0_VP) += net_driver_util.o - -obj-y += core/ -#obj-y += char/ -obj-y += console/ -obj-y += evtchn/ -obj-$(CONFIG_XEN_IA64_DOM0_VP) += balloon/ -obj-y += privcmd/ -obj-y += xenbus/ - -obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/ -obj-$(CONFIG_XEN_NETDEV_BACKEND) += netback/ -obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmback/ -obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += blkfront/ -obj-$(CONFIG_XEN_NETDEV_FRONTEND) += netfront/ -obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/ -obj-$(CONFIG_XEN_TPMDEV_FRONTEND) += tpmfront/ -obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/ -obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += pcifront/ diff -r 35f2341bfac8 -r cf12cea74afd linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile Wed May 24 09:59:04 2006 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# -# Makefile for the linux kernel. -# - -obj-y := gnttab.o features.o -obj-$(CONFIG_PROC_FS) += xen_proc.o - -ifeq ($(ARCH),ia64) -obj-y += evtchn.o -obj-y += xenia64_init.o -ifeq ($(CONFIG_XEN_IA64_DOM0_VP),y) -obj-$(CONFIG_NET) += skbuff.o -endif -else -obj-y += reboot.o evtchn.o fixup.o -obj-$(CONFIG_SMP) += smp.o # setup_profiling_timer def''d in ia64 -obj-$(CONFIG_NET) += skbuff.o # until networking is up on ia64 -endif -obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o -obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Aron Griffis
2006-May-25 01:37 UTC
Re: [Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre
This version is slightly better. It keeps some pollution out of .config if CONFIG_XEN=n. Otherwise it''s just a repost of the previous patch... This patch takes a bite out of xen-mkbuildtree-pre, which needs to disappear eventually for inclusion of xen-ia64 in Fedora. Probably these config settings will disappear when the ia64 p2m/vp conversion is complete, but for the moment it''s a clean way of handling the two personalities of xen-ia64. This is sent to xen-devel because it''s primarily common code that''s changing. Signed-off-by: Aron Griffis <aron@hp.com> # HG changeset patch # User agriffis@cougar.zko.hp.com # Node ID daa8345dbe73c5c02c1167fffbc902229f746baa # Parent 35f2341bfac8bb74ad2ca7e7f71f6c0663bb3e36 Converge the ia64-specific and general versions of xen/drivers/Makefile and xen/drivers/core/Makefile. Use Kconfig settings instead to control whether specific pieces are built. This takes a bite out of xen-mkbuildtree-pre, which needs to disappear eventually for distro inclusion. diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/arch/ia64/Kconfig --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig Wed May 24 21:42:02 2006 -0400 @@ -73,7 +73,7 @@ config XEN_IA64_DOM0_VP config XEN_IA64_DOM0_NON_VP bool - depends on !(XEN && XEN_IA64_DOM0_VP) + depends on XEN && !XEN_IA64_DOM0_VP default y help dom0 P=M model @@ -496,15 +496,33 @@ source "security/Kconfig" source "crypto/Kconfig" +# # override default values of drivers/xen/Kconfig -if !XEN_IA64_DOM0_VP +# +if XEN +config XEN_UTIL + default n if XEN_IA64_DOM0_VP + config HAVE_ARCH_ALLOC_SKB - bool - default n + default n if !XEN_IA64_DOM0_VP config HAVE_ARCH_DEV_ALLOC_SKB - bool - default n + default n if !XEN_IA64_DOM0_VP + +config XEN_NETUTIL + default n if !XEN_IA64_DOM0_VP + +config XEN_BALLOON + default n if !XEN_IA64_DOM0_VP + +config XEN_SKBUFF + default n if !XEN_IA64_DOM0_VP + +config XEN_CHAR + default n + +config XEN_REBOOT + default n endif source "drivers/xen/Kconfig" diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Wed May 24 21:42:02 2006 -0400 @@ -9,12 +9,6 @@ #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 diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/drivers/xen/Kconfig --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig Wed May 24 21:42:02 2006 -0400 @@ -228,4 +228,29 @@ config NO_IDLE_HZ bool default y +config XEN_UTIL + bool + default y + +config XEN_NETUTIL + bool + default y + +config XEN_BALLOON + bool + default y + +config XEN_CHAR + bool + default y + +config XEN_SKBUFF + bool + default y + depends on NET + +config XEN_REBOOT + bool + default y + endif diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/drivers/xen/Makefile --- a/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 21:42:02 2006 -0400 @@ -1,15 +1,13 @@ - -obj-y += net_driver_util.o -obj-y += util.o - obj-y += core/ -obj-y += char/ obj-y += console/ obj-y += evtchn/ -obj-y += balloon/ obj-y += privcmd/ obj-y += xenbus/ +obj-$(CONFIG_XEN_UTIL) += util.o +obj-$(CONFIG_XEN_NETUTIL) += net_driver_util.o +obj-$(CONFIG_XEN_BALLOON) += balloon/ +obj-$(CONFIG_XEN_CHAR) += char/ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/ obj-$(CONFIG_XEN_NETDEV_BACKEND) += netback/ obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmback/ diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/drivers/xen/core/Makefile --- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile Wed May 24 09:59:04 2006 -0600 +++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile Wed May 24 21:42:02 2006 -0400 @@ -2,10 +2,12 @@ # Makefile for the linux kernel. # -obj-y := evtchn.o reboot.o gnttab.o features.o +obj-y := evtchn.o gnttab.o features.o -obj-$(CONFIG_PROC_FS) += xen_proc.o -obj-$(CONFIG_NET) += skbuff.o -obj-$(CONFIG_SMP) += smpboot.o -obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o +obj-$(CONFIG_PROC_FS) += xen_proc.o +obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o +obj-$(CONFIG_IA64) += xenia64_init.o +obj-$(CONFIG_XEN_SKBUFF) += skbuff.o +obj-$(CONFIG_XEN_REBOOT) += reboot.o +obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Alex Williamson
2006-May-25 05:20 UTC
Re: [Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre
On Wed, 2006-05-24 at 21:37 -0400, Aron Griffis wrote:> This version is slightly better. It keeps some pollution out of > .config if CONFIG_XEN=n. Otherwise it''s just a repost of the previous > patch... > > This patch takes a bite out of xen-mkbuildtree-pre, which needs to > disappear eventually for inclusion of xen-ia64 in Fedora. Probably > these config settings will disappear when the ia64 p2m/vp conversion > is complete, but for the moment it''s a clean way of handling the two > personalities of xen-ia64. > > This is sent to xen-devel because it''s primarily common code that''s > changing.This is definitely something we need to clean up. A couple issues with the patch though; it doesn''t apply cleanly on current xen-unstable and it drops evtchn_ia64 vs evtchn. The latter is gone from the xen-ia64-unstable tree, but still exists in xen-unstable. Otherwise, I like it. Thanks, Alex -- Alex Williamson HP Linux & Open Source Lab _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2006-May-25 06:51 UTC
Re: [Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre
On 25 May 2006, at 06:20, Alex Williamson wrote:> This is definitely something we need to clean up. A couple issues > with the patch though; it doesn''t apply cleanly on current xen-unstable > and it drops evtchn_ia64 vs evtchn. The latter is gone from the > xen-ia64-unstable tree, but still exists in xen-unstable. Otherwise, I > like it. Thanks,I''ll wait for another cleaned up version of the patch before applying. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Aron Griffis
2006-May-25 18:34 UTC
Re: [Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre
Alex Williamson wrote: [Thu May 25 2006, 01:20:48AM EDT]> This is definitely something we need to clean up. A couple issues > with the patch though; it doesn''t apply cleanly on current xen-unstable > and it drops evtchn_ia64 vs evtchn. The latter is gone from the > xen-ia64-unstable tree, but still exists in xen-unstable. Otherwise, I > like it. Thanks,Thanks for catching both of these problems. Here is a new patch which applies to xen-unstable. This builds successfully on x86, x86_64, ia64-vp and ia64-non-vp. Signed-off-by: Aron Griffis <aron@hp.com> # HG changeset patch # User agriffis@cougar.zko.hp.com # Node ID 86bcc332bedd3c05ad30d2b0378f532eca8f7503 # Parent da7fe04d8e80beeda874b89f8c6e6dc80bfec4c7 Take a bite out of arch/ia64/xen-mkbuildtree-pre, which needs to go away for inclusion of xen-ia64 in Fedora. Converge the ia64-specific and general versions of xen/drivers/Makefile and xen/drivers/core/Makefile. Use Kconfig settings instead to control whether specific pieces are built. These config settings might disappear when the ia64 p2m/vp conversion is complete, but for the moment it''s a clean way of handling the two personalities of xen-ia64. Handle evtchn/evtchn_ia64 with ifeq ($(ARCH),ia64) since this will go away with the next pull of xen-ia64-unstable into xen-unstable, and I think this creates less work to undo when that occurs. diff -r da7fe04d8e80 -r 86bcc332bedd linux-2.6-xen-sparse/arch/ia64/Kconfig --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig Thu May 25 16:00:36 2006 +0100 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig Thu May 25 14:24:26 2006 -0400 @@ -73,7 +73,7 @@ config XEN_IA64_DOM0_VP config XEN_IA64_DOM0_NON_VP bool - depends on !(XEN && XEN_IA64_DOM0_VP) + depends on XEN && !XEN_IA64_DOM0_VP default y help dom0 P=M model @@ -496,15 +496,42 @@ source "security/Kconfig" source "crypto/Kconfig" +# # override default values of drivers/xen/Kconfig -if !XEN_IA64_DOM0_VP +# +if XEN +config XEN_UTIL + default n if XEN_IA64_DOM0_VP + config HAVE_ARCH_ALLOC_SKB - bool - default n + default n if !XEN_IA64_DOM0_VP config HAVE_ARCH_DEV_ALLOC_SKB - bool - default n + default n if !XEN_IA64_DOM0_VP + +config XEN_NETUTIL + default n if !XEN_IA64_DOM0_VP + +config XEN_BALLOON + default n if !XEN_IA64_DOM0_VP + +config XEN_SKBUFF + default n if !XEN_IA64_DOM0_VP + +config XEN_NETDEV_BACKEND + default n if !XEN_IA64_DOM0_VP + +config XEN_NETDEV_FRONTEND + default n if !XEN_IA64_DOM0_VP + +config XEN_CHAR + default n + +config XEN_REBOOT + default n + +config XEN_SMPBOOT + default n endif source "drivers/xen/Kconfig" diff -r da7fe04d8e80 -r 86bcc332bedd linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Thu May 25 16:00:36 2006 +0100 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Thu May 25 14:24:26 2006 -0400 @@ -9,12 +9,6 @@ #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 diff -r da7fe04d8e80 -r 86bcc332bedd linux-2.6-xen-sparse/drivers/xen/Kconfig --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig Thu May 25 16:00:36 2006 +0100 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig Thu May 25 14:24:26 2006 -0400 @@ -228,4 +228,34 @@ config NO_IDLE_HZ bool default y +config XEN_UTIL + bool + default y + +config XEN_NETUTIL + bool + default y + +config XEN_BALLOON + bool + default y + +config XEN_CHAR + bool + default y + +config XEN_SKBUFF + bool + default y + depends on NET + +config XEN_REBOOT + bool + default y + +config XEN_SMPBOOT + bool + default y + depends on SMP + endif diff -r da7fe04d8e80 -r 86bcc332bedd linux-2.6-xen-sparse/drivers/xen/Makefile --- a/linux-2.6-xen-sparse/drivers/xen/Makefile Thu May 25 16:00:36 2006 +0100 +++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Thu May 25 14:24:26 2006 -0400 @@ -1,15 +1,13 @@ - -obj-y += net_driver_util.o -obj-y += util.o - obj-y += core/ -obj-y += char/ obj-y += console/ obj-y += evtchn/ -obj-y += balloon/ obj-y += privcmd/ obj-y += xenbus/ +obj-$(CONFIG_XEN_UTIL) += util.o +obj-$(CONFIG_XEN_NETUTIL) += net_driver_util.o +obj-$(CONFIG_XEN_BALLOON) += balloon/ +obj-$(CONFIG_XEN_CHAR) += char/ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/ obj-$(CONFIG_XEN_NETDEV_BACKEND) += netback/ obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmback/ diff -r da7fe04d8e80 -r 86bcc332bedd linux-2.6-xen-sparse/drivers/xen/core/Makefile --- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile Thu May 25 16:00:36 2006 +0100 +++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile Thu May 25 14:24:26 2006 -0400 @@ -2,11 +2,21 @@ # Makefile for the linux kernel. # -obj-y := evtchn.o reboot.o gnttab.o features.o +obj-y := gnttab.o features.o -obj-$(CONFIG_PROC_FS) += xen_proc.o -obj-$(CONFIG_NET) += skbuff.o -obj-$(CONFIG_SMP) += smpboot.o -obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o -obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o -obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o +obj-$(CONFIG_PROC_FS) += xen_proc.o +obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o +obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o +obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o +obj-$(CONFIG_IA64) += xenia64_init.o +obj-$(CONFIG_XEN_SKBUFF) += skbuff.o +obj-$(CONFIG_XEN_REBOOT) += reboot.o +obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o + +# This special handling should go away with the next pull of xen-ia64-unstable +# into xen-unstable +ifeq ($(ARCH),ia64) +obj-y += evtchn_ia64.o +else +obj-y += evtchn.o +endif _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel