merge with xen-unstable.hg

diff --cc buildconfigs/linux-defconfig_xen_ia64
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/Makefile
Simple merge

diff --cc linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
index 366a9006e707ee4ebcbc8af5cec4bb62bc93df39,ecd51adcc0bc31c661112bf7243912df345e2960..13d8dffae2bc7d9f13054c5b86ca6875a87c5317
--- 1/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- 2/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
@@@ -37,11 -37,12 +37,13 @@@
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/version.h>
+ #include <linux/errno.h>
  #include <xen/interface/xen.h>
  #include <xen/interface/dom0_ops.h>
+ #include <xen/interface/sched.h>
  #include <asm/ptrace.h>
  #include <asm/page.h>
 +#include <asm/xen/privop.h> // for running_on_xen
  
  extern shared_info_t *HYPERVISOR_shared_info;
  extern start_info_t *xen_start_info;

diff --cc tools/ioemu/vl.c
Simple merge

diff --cc xen/arch/ia64/Makefile
Simple merge

diff --cc xen/arch/ia64/vmx/Makefile
Simple merge

diff --cc xen/arch/ia64/vmx/vmx_ivt.S
Simple merge

diff --cc xen/arch/ia64/xen/Makefile
index 20035faa1c98d89298d7d467005eb13070b6f8d9,600b010d1103e78471af506a0cdb099990a04eff..fa8d202d891ea596852e5c8c04950d69808ca5c0
--- 1/xen/arch/ia64/xen/Makefile
--- 2/xen/arch/ia64/xen/Makefile
+++ b/xen/arch/ia64/xen/Makefile
@@@ -23,8 -22,5 +21,6 @@@ obj-y += xenmem.
  obj-y += xenmisc.o
  obj-y += xensetup.o
  obj-y += xentime.o
 +obj-y += flushd.o
  
  obj-$(crash_debug) += gdbstub.o
- 
- include $(BASEDIR)/Post.mk

diff --cc xen/arch/ia64/xen/hypercall.c
index 42a263f9149df9129afb8836cc718ea50222ea07,286f1a42ff12ddb603a5834fa1f2597e6d72eec7..22d2a2fb41a9436b19dfa303d964775bec192f52
--- 1/xen/arch/ia64/xen/hypercall.c
--- 2/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@@ -101,10 -119,14 +106,15 @@@ xen_hypercall (struct pt_regs *regs
                break;
  
            case __HYPERVISOR_multicall:
 -              regs->r8 = do_multicall(guest_handle_from_ptr(regs->r14, multicall_entry_t), (unsigned int) regs->r15);
 +              regs->r8 = do_multicall(guest_handle_from_ptr(regs->r14,
 +                      multicall_entry_t), (unsigned int) regs->r15);
                break;
  
+           case __HYPERVISOR_sched_op:
+               regs->r8 = do_sched_op((int) regs->r14,
+                                      guest_handle_from_ptr(regs->r15, void));
+               break;
+ 
            default:
                printf("unknown xen hypercall %lx\n", regs->r2);
                regs->r8 = do_ni_hypercall();

diff --cc xen/arch/ia64/xen/irq.c
Simple merge

diff --cc xen/arch/ia64/xen/xentime.c
Simple merge