Updated xen patches taken from suse.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.xen / xen-netback-nr-irqs

diff --git a/src/patches/60056_xen-netback-nr-irqs.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen-netback-nr-irqs
similarity index 66%
rename from src/patches/60056_xen-netback-nr-irqs.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen-netback-nr-irqs
index afb3554712b592345326ec8c7549f2a43cc3b92b..ee25bdbb5160bc57b50db999b5dc0a4536a512de 100644 (file)
--- a/src/patches/60056_xen-netback-nr-irqs.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen-netback-nr-irqs
@@ -8,11 +8,9 @@ be pretty unbounded. Also, store the dynirq rather than the raw irq
 to push up the limit where the type of notify_list needs to become
 'int' rather than 'u16'.
 
-Index: head-2008-12-01/drivers/xen/netback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/netback/interface.c       2007-06-12 13:13:45.000000000 +0200
-+++ head-2008-12-01/drivers/xen/netback/interface.c    2008-12-01 12:10:26.000000000 +0100
-@@ -273,6 +273,7 @@ int netif_map(netif_t *netif, unsigned l
+--- head-2009-02-02.orig/drivers/xen/netback/interface.c       2009-02-02 09:40:43.000000000 +0100
++++ head-2009-02-02/drivers/xen/netback/interface.c    2009-02-02 10:20:51.000000000 +0100
+@@ -280,6 +280,7 @@ int netif_map(netif_t *netif, unsigned l
                netif->dev->name, netif);
        if (err < 0)
                goto err_hypervisor;
@@ -20,11 +18,9 @@ Index: head-2008-12-01/drivers/xen/netback/interface.c
        netif->irq = err;
        disable_irq(netif->irq);
  
-Index: head-2008-12-01/drivers/xen/netback/netback.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/netback/netback.c 2008-12-01 12:10:23.000000000 +0100
-+++ head-2008-12-01/drivers/xen/netback/netback.c      2008-12-01 12:10:26.000000000 +0100
-@@ -564,8 +564,12 @@ static void net_rx_action(unsigned long 
+--- head-2009-02-02.orig/drivers/xen/netback/netback.c 2008-12-23 09:35:35.000000000 +0100
++++ head-2009-02-02/drivers/xen/netback/netback.c      2008-12-23 09:35:42.000000000 +0100
+@@ -580,8 +580,12 @@ static void net_rx_action(unsigned long 
        static mmu_update_t rx_mmu[NET_RX_RING_SIZE];
        static gnttab_transfer_t grant_trans_op[NET_RX_RING_SIZE];
        static gnttab_copy_t grant_copy_op[NET_RX_RING_SIZE];
@@ -38,7 +34,7 @@ Index: head-2008-12-01/drivers/xen/netback/netback.c
        static struct netbk_rx_meta meta[NET_RX_RING_SIZE];
  
        struct netrx_pending_operations npo = {
-@@ -714,11 +718,9 @@ static void net_rx_action(unsigned long 
+@@ -730,11 +734,9 @@ static void net_rx_action(unsigned long 
                                         nr_frags);
  
                RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&netif->rx, ret);
@@ -52,7 +48,7 @@ Index: head-2008-12-01/drivers/xen/netback/netback.c
  
                if (netif_queue_stopped(netif->dev) &&
                    netif_schedulable(netif) &&
-@@ -732,8 +734,8 @@ static void net_rx_action(unsigned long 
+@@ -748,8 +750,8 @@ static void net_rx_action(unsigned long 
  
        while (notify_nr != 0) {
                irq = notify_list[--notify_nr];