Updated xen patches taken from suse.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.xen / xen-configurable-guest-devices

diff --git a/src/patches/60055_xen-configurable-guest-devices.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen-configurable-guest-devices
similarity index 73%
rename from src/patches/60055_xen-configurable-guest-devices.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen-configurable-guest-devices
index 43b2115cc26f7c2203d533254d8a4cce2fedb840..c0256c9c79ed59989808d26e268cdfc165f71bd0 100644 (file)
--- a/src/patches/60055_xen-configurable-guest-devices.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen-configurable-guest-devices
@@ -7,15 +7,9 @@ value).
 Similarly, allow the number of simultaneous transmits in netback to be
 configurable.
 
----
- drivers/xen/Kconfig                        |   19 +++++++++++++++++++
- drivers/xen/netback/netback.c              |    3 ++-
- include/asm-x86/mach-xen/asm/irq_vectors.h |    2 +-
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
---- a/drivers/xen/Kconfig
-+++ b/drivers/xen/Kconfig
-@@ -74,6 +74,15 @@ config XEN_NETDEV_BACKEND
+--- sle11-2009-03-04.orig/drivers/xen/Kconfig  2009-03-05 15:45:30.000000000 +0100
++++ sle11-2009-03-04/drivers/xen/Kconfig       2008-12-05 16:57:43.000000000 +0100
+@@ -73,6 +73,15 @@ config XEN_NETDEV_BACKEND
          network devices to other guests via a high-performance shared-memory
          interface.
  
@@ -48,9 +42,9 @@ configurable.
  choice
        prompt "Xen version compatibility"
        default XEN_COMPAT_030002_AND_LATER
---- a/drivers/xen/netback/netback.c
-+++ b/drivers/xen/netback/netback.c
-@@ -74,7 +74,7 @@ static DECLARE_TASKLET(net_rx_tasklet, n
+--- sle11-2009-03-04.orig/drivers/xen/netback/netback.c        2009-03-05 15:45:30.000000000 +0100
++++ sle11-2009-03-04/drivers/xen/netback/netback.c     2008-12-23 09:35:35.000000000 +0100
+@@ -71,7 +71,7 @@ static DECLARE_TASKLET(net_rx_tasklet, n
  static struct timer_list net_timer;
  static struct timer_list netbk_tx_pending_timer;
  
@@ -59,7 +53,7 @@ configurable.
  
  static struct sk_buff_head rx_queue;
  
-@@ -1196,6 +1196,7 @@ static void net_tx_action(unsigned long 
+@@ -1212,6 +1212,7 @@ static void net_tx_action(unsigned long 
                net_tx_action_dealloc();
  
        mop = tx_map_ops;
@@ -67,8 +61,8 @@ configurable.
        while (((NR_PENDING_REQS + MAX_SKB_FRAGS) < MAX_PENDING_REQS) &&
                !list_empty(&net_schedule_list)) {
                /* Get a netif from the list with work to do. */
---- a/include/asm-x86/mach-xen/asm/irq_vectors.h
-+++ b/include/asm-x86/mach-xen/asm/irq_vectors.h
+--- sle11-2009-03-04.orig/include/asm-x86/mach-xen/asm/irq_vectors.h   2009-03-05 15:45:30.000000000 +0100
++++ sle11-2009-03-04/include/asm-x86/mach-xen/asm/irq_vectors.h        2009-03-05 15:45:49.000000000 +0100
 @@ -44,7 +44,7 @@
  #endif