Adding 13.fc7 patches

svn path=/patches/; revision=9

3 files changed, 160 insertions, 0 deletions

diff --git a/trunk/2.6.20/fedora-xen-patches/0960-linux-2.6-xen-blkfront-wait-add.patch b/trunk/2.6.20/fedora-xen-patches/0960-linux-2.6-xen-blkfront-wait-add.patch
new file mode 100644
index 0000000..e17438b
--- /dev/null
+++ b/trunk/2.6.20/fedora-xen-patches/0960-linux-2.6-xen-blkfront-wait-add.patch
@@ -0,0 +1,85 @@
+Make xenblk wait to the disk to be added
+See http://bugzilla.redhat.com/248462
+
+Index: linux-2.6.20.i386/drivers/xen/blkfront/blkfront.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/xen/blkfront/blkfront.c
++++ linux-2.6.20.i386/drivers/xen/blkfront/blkfront.c
+@@ -343,6 +343,8 @@ static void connect(struct blkfront_info
+ 	spin_unlock_irq(&blkif_io_lock);
+ 
+ 	add_disk(info->gd);
++
++	info->is_ready = 1;
+ }
+ 
+ /**
+@@ -852,6 +854,13 @@ static void blkif_recover(struct blkfron
+ 	spin_unlock_irq(&blkif_io_lock);
+ }
+ 
++int blkfront_is_ready(struct xenbus_device *dev)
++{
++	struct blkfront_info *info = dev->dev.driver_data;
++
++	return info->is_ready;
++}
++
+ 
+ /* ** Driver Registration ** */
+ 
+@@ -870,6 +879,7 @@ static struct xenbus_driver blkfront = {
+ 	.remove = blkfront_remove,
+ 	.resume = blkfront_resume,
+ 	.otherend_changed = backend_changed,
++	.is_ready = blkfront_is_ready,
+ };
+ 
+ 
+Index: linux-2.6.20.i386/drivers/xen/blkfront/block.h
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/xen/blkfront/block.h
++++ linux-2.6.20.i386/drivers/xen/blkfront/block.h
+@@ -125,6 +125,7 @@ struct blkfront_info
+ 	struct blk_shadow shadow[BLK_RING_SIZE];
+ 	unsigned long shadow_free;
+ 	int feature_barrier;
++	int is_ready;
+ 
+ 	/**
+ 	 * The number of people holding this device open.  We won't allow a
+Index: linux-2.6.20.i386/drivers/xen/xenbus/xenbus_probe.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/xen/xenbus/xenbus_probe.c
++++ linux-2.6.20.i386/drivers/xen/xenbus/xenbus_probe.c
+@@ -940,6 +940,7 @@ static int is_disconnected_device(struct
+ {
+ 	struct xenbus_device *xendev = to_xenbus_device(dev);
+ 	struct device_driver *drv = data;
++	struct xenbus_driver *xendrv;
+ 
+ 	/*
+ 	 * A device with no driver will never connect. We care only about
+@@ -952,7 +953,9 @@ static int is_disconnected_device(struct
+ 	if (drv && (dev->driver != drv))
+ 		return 0;
+ 
+-	return (xendev->state != XenbusStateConnected);
++	xendrv = to_xenbus_driver(dev->driver);
++	return (xendev->state != XenbusStateConnected ||
++		(xendrv->is_ready && !xendrv->is_ready(xendev)));
+ }
+ 
+ static int exists_disconnected_device(struct device_driver *drv)
+Index: linux-2.6.20.i386/include/xen/xenbus.h
+===================================================================
+--- linux-2.6.20.i386.orig/include/xen/xenbus.h
++++ linux-2.6.20.i386/include/xen/xenbus.h
+@@ -105,6 +105,7 @@ struct xenbus_driver {
+ 	int (*uevent)(struct xenbus_device *, char **, int, char *, int);
+ 	struct device_driver driver;
+ 	int (*read_otherend_details)(struct xenbus_device *dev);
++	int (*is_ready)(struct xenbus_device *dev);
+ };
+ 
+ static inline struct xenbus_driver *to_xenbus_driver(struct device_driver *drv)
diff --git a/trunk/2.6.20/fedora-xen-patches/1665-linux-2.6-disable-netback-checksum.patch b/trunk/2.6.20/fedora-xen-patches/1665-linux-2.6-disable-netback-checksum.patch
new file mode 100644
index 0000000..18b4dae
--- /dev/null
+++ b/trunk/2.6.20/fedora-xen-patches/1665-linux-2.6-disable-netback-checksum.patch
@@ -0,0 +1,37 @@
+From: Herbert Xu <herbert.xu@redhat.com>
+Subject: Re: Final resolution for the checksum problems
+
+
+Daniel P. Berrange <berrange@redhat.com> wrote:
+>
+>> > Alternatively we could just make netback default tx checksums to off
+>> > which should have a similar effect as disabling it on virbr0.
+>> 
+>> This seems like a simpler path than introducing new infrastructure for
+>> scripts to run every time the interface is brought up/down.  And then
+>> it's even easier to remove the "trigger" when we get the functionality
+>> in the kernel
+> 
+> I agree - this would be even simpler. 
+
+Here is a patch which does just that.
+
+Cheers,
+-- 
+Visit Openswan at http://www.openswan.org/
+Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
+Home Page: http://gondor.apana.org.au/~herbert/
+PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
+--
+--- a/drivers/xen/netback/interface.c	2007-04-28 11:57:31.000000000 +1000
++++ b/drivers/xen/netback/interface.c	2007-05-02 19:58:16.000000000 +1000
+@@ -161,7 +161,6 @@
+ 	dev->open            = net_open;
+ 	dev->stop            = net_close;
+ 	dev->change_mtu	     = netbk_change_mtu;
+-	dev->features        = NETIF_F_IP_CSUM;
+ 
+ 	SET_ETHTOOL_OPS(dev, &network_ethtool_ops);
+ 
+
+
diff --git a/trunk/2.6.20/fedora-xen-patches/3000-linux-2.6-acpi-config_pm-poweroff.patch b/trunk/2.6.20/fedora-xen-patches/3000-linux-2.6-acpi-config_pm-poweroff.patch
new file mode 100644
index 0000000..e925785
--- /dev/null
+++ b/trunk/2.6.20/fedora-xen-patches/3000-linux-2.6-acpi-config_pm-poweroff.patch
@@ -0,0 +1,38 @@
+See http://bugzilla.redhat.com/241381
+
+From b7da11fc422b5d06ab6ed5444a1f01ac0e805c74 Mon Sep 17 00:00:00 2001
+From: Eduardo Habkost <ehabkost@redhat.com>
+Date: Tue, 10 Jul 2007 19:02:14 -0300
+Subject: [PATCH] Remove #ifdef CONFIG_PM from ACPI power-off code
+
+The ACPI poweroff code is inside a #ifdef CONFIG_PM, that was added on
+commit b35c67a46b025e8dc320b59fbe5c283094e1d7f5. It is not necessary
+because the poweroff code compiles and works even with CONFIG_PM disabled.
+
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
+---
+ drivers/acpi/sleep/poweroff.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
+index d9801ef..5d6ba10 100644
+--- a/drivers/acpi/sleep/poweroff.c
++++ b/drivers/acpi/sleep/poweroff.c
+@@ -37,8 +37,6 @@ #endif
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_PM
+-
+ void acpi_power_off(void)
+ {
+ 	/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
+@@ -94,5 +92,3 @@ static int acpi_poweroff_init(void)
+ }
+ 
+ late_initcall(acpi_poweroff_init);
+-
+-#endif				/* CONFIG_PM */
+-- 
+silverbrick.install.2006.08.14-dirty
+