[Pkg-uml-commit] [SCM] Debian packaging for the Usermode Linux kernel branch, master, updated. 30f8329f2464c792dcb91293fee1ddcd63cc5317

[Mattia Dongili]

The following commit has been merged in the master branch:
commit 3e0949bbc96ee3adf842bdfdd8b5b5b654f93325
Author: Mattia Dongili <malattia at linux.it>
Date:   Tue Jul 7 15:56:29 2009 +0900

    Add patch 04_remove_irqf_disabled
    
    This patch brings back a working network inside the guest kernel.
    See also
    http://www.mail-archive.com/user-mode-linux-devel@lists.sourceforge.net/msg06464.html
    
    Signed-off-by: Mattia Dongili <malattia at linux.it>

diff --git a/debian/changelog b/debian/changelog
index c7738e9..947dabb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ user-mode-linux (2.6.30-1um-1) unstable; urgency=low
 
   * New upstream release.
   * Remove 07_vde_user_build_fix which has been merged upstream.
+  * Add 04_remove_irqf_disabled.patch to bring get a working network inside
+    the guest.
 
  -- Mattia Dongili <malattia at debian.org>  Sun, 05 Jul 2009 11:07:28 +0900
 
diff --git a/debian/patches/04_remove_irqf_disabled.patch b/debian/patches/04_remove_irqf_disabled.patch
new file mode 100644
index 0000000..cb8aa19
--- /dev/null
+++ b/debian/patches/04_remove_irqf_disabled.patch
@@ -0,0 +1,14 @@
+http://www.mail-archive.com/user-mode-linux-devel@lists.sourceforge.net/msg06464.html
+This patch make the guest network work again.
+
+--- linux-source-2.6.30.orig/arch/um/drivers/net_kern.c	2009-06-10 12:05:27.000000000 +0900
++++ linux-source-2.6.30/arch/um/drivers/net_kern.c	2009-07-05 23:32:30.952417452 +0900
+@@ -165,7 +165,7 @@ static int uml_net_open(struct net_devic
+ 	}
+ 
+ 	err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
+-			     IRQF_DISABLED | IRQF_SHARED, dev->name, dev);
++			     IRQF_SHARED, dev->name, dev);
+ 	if (err != 0) {
+ 		printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
+ 		err = -ENETUNREACH;
diff --git a/debian/patches/series b/debian/patches/series
index 3d228dc..5278125 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02_x-terminal-emulator.patch
 03_uml_switch.patch
+04_remove_irqf_disabled.patch

-- 
Debian packaging for the Usermode Linux kernel