1.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Sat Mar 31 17:22:46 2007 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Sat Mar 31 19:02:09 2007 +0100
     1.3 @@ -576,15 +576,6 @@ source "crypto/Kconfig"
     1.4  # override default values of drivers/xen/Kconfig
     1.5  #
     1.6  if XEN
     1.7 -config XEN_UTIL
     1.8 -	default n
     1.9 -
    1.10 -config XEN_BALLOON
    1.11 -	default y
    1.12 -
    1.13 -config XEN_REBOOT
    1.14 -	default y
    1.15 -
    1.16  config XEN_SMPBOOT
    1.17  	default n
    1.18  endif

     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig	Sat Mar 31 17:22:46 2007 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig	Sat Mar 31 19:02:09 2007 +0100
     2.3 @@ -253,22 +253,6 @@ config NO_IDLE_HZ
     2.4  	bool
     2.5  	default y
     2.6  
     2.7 -config XEN_UTIL
     2.8 -	bool
     2.9 -	default y
    2.10 -
    2.11 -config XEN_BALLOON
    2.12 -	bool
    2.13 -	default y
    2.14 -
    2.15 -config XEN_DEVMEM
    2.16 -	bool
    2.17 -	default y
    2.18 -
    2.19 -config XEN_REBOOT
    2.20 -	bool
    2.21 -	default y
    2.22 -
    2.23  config XEN_SMPBOOT
    2.24  	bool
    2.25  	default y

     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/Makefile	Sat Mar 31 17:22:46 2007 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Makefile	Sat Mar 31 19:02:09 2007 +0100
     3.3 @@ -4,10 +4,10 @@ obj-y	+= evtchn/
     3.4  obj-y	+= privcmd/
     3.5  obj-y	+= xenbus/
     3.6  obj-y	+= gntdev/
     3.7 +obj-y	+= balloon/
     3.8 +obj-y	+= char/
     3.9  
    3.10 -obj-$(CONFIG_XEN_UTIL)			+= util.o
    3.11 -obj-$(CONFIG_XEN_BALLOON)		+= balloon/
    3.12 -obj-$(CONFIG_XEN_DEVMEM)		+= char/
    3.13 +obj-y	+= util.o
    3.14  obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= blkback/
    3.15  obj-$(CONFIG_XEN_BLKDEV_TAP)		+= blktap/
    3.16  obj-$(CONFIG_XEN_NETDEV_BACKEND)	+= netback/

     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile	Sat Mar 31 17:22:46 2007 +0100
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile	Sat Mar 31 19:02:09 2007 +0100
     4.3 @@ -2,12 +2,11 @@
     4.4  # Makefile for the linux kernel.
     4.5  #
     4.6  
     4.7 -obj-y := evtchn.o gnttab.o features.o
     4.8 +obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o
     4.9  
    4.10  obj-$(CONFIG_PROC_FS)		+= xen_proc.o
    4.11  obj-$(CONFIG_SYSFS)		+= hypervisor_sysfs.o
    4.12  obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
    4.13  obj-$(CONFIG_XEN_SYSFS)		+= xen_sysfs.o
    4.14 -obj-$(CONFIG_XEN_REBOOT)	+= reboot.o machine_reboot.o
    4.15  obj-$(CONFIG_XEN_SMPBOOT)	+= smpboot.o
    4.16  obj-$(CONFIG_KEXEC)		+= machine_kexec.o

     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/util.c	Sat Mar 31 17:22:46 2007 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/util.c	Sat Mar 31 19:02:09 2007 +0100
     5.3 @@ -22,6 +22,9 @@ struct class *get_xen_class(void)
     5.4  }
     5.5  EXPORT_SYMBOL_GPL(get_xen_class);
     5.6  
     5.7 +/* Todo: merge ia64 ('auto-translate physmap') versions of these functions. */
     5.8 +#ifndef __ia64__
     5.9 +
    5.10  static int f(pte_t *pte, struct page *pmd_page, unsigned long addr, void *data)
    5.11  {
    5.12  	/* apply_to_page_range() does all the hard work. */
    5.13 @@ -63,3 +66,5 @@ void free_vm_area(struct vm_struct *area
    5.14  	kfree(area);
    5.15  }
    5.16  EXPORT_SYMBOL_GPL(free_vm_area);
    5.17 +
    5.18 +#endif /* !__ia64__ */