From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Tue, 25 Jul 2006 18:19:05 +0000 (-0600)
Subject: merge with xen-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15786^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31423d8a91525f83f501a61b9b259420fc026cb8;p=xen.git

merge with xen-unstable.hg
---

31423d8a91525f83f501a61b9b259420fc026cb8
diff --cc buildconfigs/linux-defconfig_xen0_ia64
index d8b5941ba4,f616501246..08a32721aa
--- a/buildconfigs/linux-defconfig_xen0_ia64
+++ b/buildconfigs/linux-defconfig_xen0_ia64
@@@ -1526,7 -1528,8 +1526,8 @@@ CONFIG_XEN_PRIVCMD=
  CONFIG_XEN_BACKEND=y
  # CONFIG_XEN_PCIDEV_BACKEND is not set
  CONFIG_XEN_BLKDEV_BACKEND=y
 +CONFIG_XEN_XENBUS_DEV=y
+ # CONFIG_XEN_BLKDEV_TAP is not set
 -CONFIG_XEN_NETDEV_BACKEND=y
  # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
  CONFIG_XEN_NETDEV_LOOPBACK=y
  # CONFIG_XEN_TPMDEV_BACKEND is not set
diff --cc buildconfigs/linux-defconfig_xen_ia64
index ed95403040,2b921a1b6c..566a70522e
--- a/buildconfigs/linux-defconfig_xen_ia64
+++ b/buildconfigs/linux-defconfig_xen_ia64
@@@ -1532,7 -1534,8 +1532,8 @@@ CONFIG_XEN_PRIVCMD=
  CONFIG_XEN_BACKEND=y
  # CONFIG_XEN_PCIDEV_BACKEND is not set
  CONFIG_XEN_BLKDEV_BACKEND=y
 +CONFIG_XEN_XENBUS_DEV=y
+ # CONFIG_XEN_BLKDEV_TAP is not set
 -CONFIG_XEN_NETDEV_BACKEND=y
  # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
  CONFIG_XEN_NETDEV_LOOPBACK=y
  # CONFIG_XEN_TPMDEV_BACKEND is not set
diff --cc tools/libxc/Makefile
index 89e3264993,64ec867a1e..8d27af904c
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@@ -29,7 -29,9 +29,8 @@@ GUEST_SRCS-y :
  GUEST_SRCS-y += xc_load_bin.c
  GUEST_SRCS-y += xc_load_elf.c
  GUEST_SRCS-y += xg_private.c
+ GUEST_SRCS-$(CONFIG_POWERPC) += xc_ppc_linux_build.c
+ GUEST_SRCS-$(CONFIG_X86) += xc_linux_build.c
 -GUEST_SRCS-$(CONFIG_IA64) += xc_ia64_stubs.c xc_linux_build.c
  GUEST_SRCS-$(CONFIG_MIGRATE) += xc_linux_restore.c xc_linux_save.c
  GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c