[kernel] r6726 - in dists/sid/linux-2.6/debian: patches patches/series

Sun May 28 21:00:08 UTC 2006

Author: cts
Date: Sun May 28 21:00:06 2006
New Revision: 6726

Added:
   dists/sid/linux-2.6/debian/patches/m68k-mac68k.patch
      - copied, changed from r6718, /dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch
Removed:
   dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/15-extra

Log:
replace m68k-via patch with Finn Thain's version


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================

--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun May 28 21:00:06 2006
@@ -5,7 +5,7 @@
     - NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
 
   [ Christian T. Steigies ]
-  * [m68k] Add mac via patch.
+  * [m68k] Add mac via patch from Finn Thain.
   * [m68k] Enable INPUT_EVDEV.
 
   [ Martin Michlmayr ]

Copied: dists/sid/linux-2.6/debian/patches/m68k-mac68k.patch (from r6718, /dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch)
==============================================================================
--- /dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/m68k-mac68k.patch	Sun May 28 21:00:06 2006
@@ -1,5 +1,20 @@
---- source-m68k-none/arch/m68k/mac/config.c.orig	2006-05-23 22:55:56.000000000 +0200
-+++ source-m68k-none/arch/m68k/mac/config.c	2006-05-23 22:58:52.000000000 +0200
+Log message:
+Some fixes and cleanups from the linux-mac68k repo. Fix mac_esp by clearing
+the VIA2 SCSI IRQ flag before the SCSI IRQ handler is invoked. 
+Also fix a race condition caused by unmasking a nubus slot IRQ then 
+setting the relevant nubus_active bit. (From Finn Thain)
+
+Modified files:
+    linux/arch/m68k/mac:
+	config.c macints.c via.c 
+
+
+Index: linux/arch/m68k/mac/config.c
+Stats: 13 deletions
+http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/mac/config%2ec.diff?r1=1.21&r2=1.22
+========================================================================
+--- linux/arch/m68k/mac/config.c	28 Jan 2006 21:36:16 -0000	1.21
++++ linux/arch/m68k/mac/config.c	26 May 2006 09:53:40 -0000	1.22
 @@ -89,24 +89,11 @@
  
  static void mac_get_model(char *str);
@@ -25,10 +40,13 @@
  /*
   * Parse a Macintosh-specific record in the bootinfo
   */
-
---- source/arch/m68k/mac/macints.c.orig	2006-03-20 06:53:29.000000000 +0100
-+++ source/arch/m68k/mac/macints.c	2006-05-23 22:46:25.000000000 +0200
-@@ -216,7 +216,6 @@
+Index: linux/arch/m68k/mac/macints.c
+Stats: 1 deletion
+http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/mac/macints%2ec.diff?r1=1.12&r2=1.13
+========================================================================
+--- linux/arch/m68k/mac/macints.c	28 Jan 2006 21:36:16 -0000	1.12
++++ linux/arch/m68k/mac/macints.c	26 May 2006 09:53:40 -0000	1.13
+@@ -208,7 +208,6 @@
   * console_loglevel determines NMI handler function
   */
  
@@ -36,8 +54,12 @@
  irqreturn_t mac_nmi_handler(int, void *, struct pt_regs *);
  irqreturn_t mac_debug_handler(int, void *, struct pt_regs *);
  
---- source-m68k-none/arch/m68k/mac/via.c.orig	2006-05-23 23:03:13.000000000 +0200
-+++ source-m68k-none/arch/m68k/mac/via.c	2006-05-23 23:05:43.000000000 +0200
+Index: linux/arch/m68k/mac/via.c
+Stats: 2 insertions, 15 deletions
+http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/mac/via%2ec.diff?r1=1.7&r2=1.8
+========================================================================
+--- linux/arch/m68k/mac/via.c	28 Jan 2006 21:36:16 -0000	1.7
++++ linux/arch/m68k/mac/via.c	26 May 2006 09:53:40 -0000	1.8
 @@ -25,7 +25,6 @@
  #include <linux/init.h>
  #include <linux/ide.h>
@@ -54,7 +76,19 @@
  extern irqreturn_t mac_scc_dispatch(int, void *, struct pt_regs *);
  extern int oss_present;
  
-@@ -270,12 +268,6 @@
+@@ -212,11 +210,6 @@
+ 			break;
+ 	}
+ #else
+-	/* The alernate IRQ mapping seems to just not work. Anyone with a   */
+-	/* supported machine is welcome to take a stab at fixing it. It     */
+-	/* _should_ work on the following Quadras: 610,650,700,800,900,950  */
+-	/*                                               - 1999-06-12 (jmt) */
+-
+ 	via_alt_mapping = 0;
+ #endif
+ 
+@@ -270,12 +263,6 @@
  		request_irq(IRQ_AUTO_1, via1_irq,
  				IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
  				(void *) via1);
@@ -67,7 +101,7 @@
  	}
  	request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
  			"via2", (void *) via2);
-@@ -471,8 +463,8 @@
+@@ -471,8 +458,8 @@
  	for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
  		if (events & irq_bit) {
  			via2[gIER] = irq_bit;
@@ -77,7 +111,7 @@
  			via2[gIER] = irq_bit | 0x80;
  		}
  	return IRQ_HANDLED;
-@@ -529,6 +521,7 @@
+@@ -529,6 +516,7 @@
  		}
  		via2[gIER] = irq_bit | 0x80;
  	} else if (irq_src == 7) {
@@ -85,7 +119,7 @@
  		if (rbv_present) {
  			/* enable the slot interrupt. SIER works like IER. */
  			via2[rSIER] = IER_SET_BIT(irq_idx);
-@@ -550,7 +543,6 @@
+@@ -550,7 +538,6 @@
  				}
  			}
  		}
@@ -93,3 +127,8 @@
  	}
  }
  
+-
+To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+

Modified: dists/sid/linux-2.6/debian/patches/series/15-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/15-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/15-extra	Sun May 28 21:00:06 2006
@@ -1,5 +1,5 @@
 #+ m68k-dma.patch m68k
-#+ m68k-via2-scsi.patch m68k
++ m68k-mac68k.patch m68k
 + mips-dec-serial.patch mipsel
 + mips-dec-scsi.patch mipsel
 + mips-dec-rtc.patch mipsel

