[kernel] r9440 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Mon Sep  3 16:15:37 2007
New Revision: 9440

Log:
Add a fix so qemu NE2000 will work again.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/mips/i8259-disable-method.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Sep  3 16:15:37 2007
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.22-5) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * Add stable release 2.6.22.6:
     - USB: allow retry on descriptor fetch errors
     - PCI: lets kill the 'PCI hidden behind bridge' message
@@ -28,6 +29,9 @@
     - IPV6: Fix kernel panic while send SCTP data with IP fragments
     - i386: fix lazy mode vmalloc synchronization for paravirt
 
+  [ Martin Michlmayr ]
+  * mips: Add a fix so qemu NE2000 will work again.
+
  -- maximilian attems <maks at debian.org>  Sat, 01 Sep 2007 17:45:38 +0200
 
 linux-2.6 (2.6.22-4) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/i8259-disable-method.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/i8259-disable-method.patch	Mon Sep  3 16:15:37 2007
@@ -0,0 +1,30 @@
+From: Kyungmin Park <kyungmin.park at samsung.com>
+Date: Fri, 10 Aug 2007 21:00:21 +0000 (-0700)
+Subject: [MIPS] i8259: Add disable method.
+X-Git-Tag: linux-2.6.23-rc4~1
+X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=b445dddb98143ffa52e3e3d8b082f04b04f3e18b;hp=11d9842e7844b97f45b73a26b0982face31a3728
+
+[MIPS] i8259: Add disable method.
+
+After 76d2160147f43f982dfe881404cfde9fd0a9da21, the qemu NE2000 was
+frequently producing WATCHDOG timeouts.
+
+Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
+Cc: Ralf Baechle <ralf at linux-mips.org>
+Cc: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+---
+
+diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
+index 2345160..b6c3080 100644
+--- a/arch/mips/kernel/i8259.c
++++ b/arch/mips/kernel/i8259.c
+@@ -36,6 +36,7 @@ void mask_and_ack_8259A(unsigned int);
+ static struct irq_chip i8259A_chip = {
+ 	.name		= "XT-PIC",
+ 	.mask		= disable_8259A_irq,
++	.disable	= disable_8259A_irq,
+ 	.unmask		= enable_8259A_irq,
+ 	.mask_ack	= mask_and_ack_8259A,
+ };

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	(original)
+++ dists/sid/linux-2.6/debian/patches/series/5	Mon Sep  3 16:15:37 2007
@@ -1,2 +1,3 @@
 - bugfix/sparc/sun4u-pci-config-space.patch
 + bugfix/2.6.22.6
++ bugfix/mips/i8259-disable-method.patch