From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Sun, 27 Aug 2006 16:24:41 +0000 (-0600)
Subject: merge with xen-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15692
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=22932bd03cd7002021acb6b5075a07bf3fc51323;p=xen.git

merge with xen-unstable.hg
---

22932bd03cd7002021acb6b5075a07bf3fc51323
diff --cc tools/libxc/ia64/xc_ia64_hvm_build.c
index ce90475007,b400162192..2c34b44a1d
--- a/tools/libxc/ia64/xc_ia64_hvm_build.c
+++ b/tools/libxc/ia64/xc_ia64_hvm_build.c
@@@ -553,8 -553,9 +553,8 @@@ setup_guest(int xc_handle, uint32_t dom
  {
      unsigned long page_array[2];
      shared_iopage_t *sp;
 -    int i;
      unsigned long dom_memsize = (memsize << 20);
-     DECLARE_DOM0_OP;
+     DECLARE_DOMCTL;
  
      if ((image_size > 12 * MEM_M) || (image_size & (PAGE_SIZE - 1))) {
          PERROR("Guest firmware size is incorrect [%ld]?", image_size);
diff --cc xen/arch/ia64/xen/hypercall.c
index 203d0211c5,b6586c9106..4a9ac5b5ec
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@@ -42,12 -42,12 +43,12 @@@ const hypercall_t ia64_hypercall_table[
  	(hypercall_t)do_ni_hypercall,		/* do_set_gdt */
  	(hypercall_t)do_ni_hypercall,		/* do_stack_switch */
  	(hypercall_t)do_ni_hypercall,		/* do_set_callbacks */
 -	(hypercall_t)do_ni_hypercall,		/* do_fpu_taskswitch */		/*  5 */
 +	(hypercall_t)do_ni_hypercall,		/* do_fpu_taskswitch *//*  5 */
  	(hypercall_t)do_sched_op_compat,
- 	(hypercall_t)do_dom0_op,
+ 	(hypercall_t)do_ni_hypercall,
  	(hypercall_t)do_ni_hypercall,		/* do_set_debugreg */
  	(hypercall_t)do_ni_hypercall,		/* do_get_debugreg */
 -	(hypercall_t)do_ni_hypercall,		/* do_update_descriptor */	/* 10 */
 +	(hypercall_t)do_ni_hypercall,		/* do_update_descriptor * 10 */
  	(hypercall_t)do_ni_hypercall,		/* do_ni_hypercall */
  	(hypercall_t)do_memory_op,
  	(hypercall_t)do_multicall,