SOURCES (LINUX_2_6_16): xen-3.0-2.6.16.patch - fixed build on amd64

[marcus]

Author: marcus                       Date: Sun Sep  3 11:29:46 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6_16
---- Log message:
- fixed build on amd64

---- Files affected:
SOURCES:
   xen-3.0-2.6.16.patch (1.1.2.2.2.1 -> 1.1.2.2.2.2) 

---- Diffs:

================================================================
Index: SOURCES/xen-3.0-2.6.16.patch
diff -u SOURCES/xen-3.0-2.6.16.patch:1.1.2.2.2.1 SOURCES/xen-3.0-2.6.16.patch:1.1.2.2.2.2
--- SOURCES/xen-3.0-2.6.16.patch:1.1.2.2.2.1	Fri Jun 30 14:25:43 2006
+++ SOURCES/xen-3.0-2.6.16.patch	Sun Sep  3 13:29:41 2006
@@ -25378,7 +25378,7 @@
  	 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 @@
  source "drivers/pcmcia/Kconfig"
  
  source "drivers/pci/hotplug/Kconfig"
-+endif
++
  
  endmenu
  
@@ -46304,7 +46304,7 @@
 +		= 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 @@
 +				 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.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/xen-3.0-2.6.16.patch?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&f=u