- fixed build on amd64

Changed files:
    xen-3.0-2.6.16.patch -> 1.1.2.2.2.2

diff --git a/xen-3.0-2.6.16.patch b/xen-3.0-2.6.16.patch
index c71df3b92cdc8a20992153287597fa6f3892f4ba..0abc12f7cbf5775b84f12796367039eecec5d08e 100644 (file)
--- a/xen-3.0-2.6.16.patch
+++ b/xen-3.0-2.6.16.patch
@@ -25378,7 +25378,7 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/x86_64/Kconfig
         from i386. Requires that the driver writer used memory barriers
         properly.
  
-+if !X86_64_XEN
++
  source "drivers/pci/pcie/Kconfig"
  
  source "drivers/pci/Kconfig"
@@ -25386,7 +25386,7 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/x86_64/Kconfig
  source "drivers/pcmcia/Kconfig"
  
  source "drivers/pci/hotplug/Kconfig"
-+endif
++
  
  endmenu
  
@@ -46304,7 +46304,7 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/drivers/xen/blktap/x
 +              = container_of(watch, struct backend_info, watch);
 +
 +      /* If other end is gone, delete ourself. */
-+      if (vec && !xenbus_exists(be->frontpath, "")) {
++      if (vec && !xenbus_exists(XBT_NULL, be->frontpath, "")) {
 +              xenbus_rm(be->dev->nodename, "");
 +              device_unregister(&be->dev->dev);
 +              return;
@@ -46396,7 +46396,7 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/drivers/xen/blktap/x
 +                               dev->nodename);
 +              goto free_be;
 +      }
-+      if (strlen(frontend) == 0 || !xenbus_exists(frontend, "")) {
++      if (strlen(frontend) == 0 || !xenbus_exists(XBT_NULL, frontend, "")) {
 +              /* If we can't get a frontend path and a frontend-id,
 +               * then our bus-id is no longer valid and we need to
 +               * destroy the backend device.