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

[Christian T. Steigies]

Author: cts
Date: Tue May 23 22:00:27 2006
New Revision: 6673

Added:
   dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch
   dists/sid/linux-2.6/debian/patches/series/15-extra
Modified:
   dists/sid/linux-2.6/debian/changelog

Log:
Add mac via patch


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue May 23 22:00:27 2006
@@ -3,7 +3,10 @@
   * Add stable release 2.6.16.18:
     - NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
 
- -- maximilian attems <maks at sternwelten.at>  Mon, 22 May 2006 22:25:35 +0200
+  [ Christian T. Steigies ]
+  * [m68k] Add mac via patch.
+
+ -- Christian T. Steigies <cts at debian.org>  Tue, 23 May 2006 23:19:51 +0200
 
 linux-2.6 (2.6.16-14) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/m68k-via2-scsi.patch	Tue May 23 22:00:27 2006
@@ -0,0 +1,95 @@
+--- 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
+@@ -89,24 +89,11 @@
+ 
+ static void mac_get_model(char *str);
+ 
+-void mac_bang(int irq, void *vector, struct pt_regs *p)
+-{
+-	printk(KERN_INFO "Resetting ...\n");
+-	mac_reset();
+-}
+-
+ static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *))
+ {
+ 	via_init_clock(vector);
+ }
+ 
+-#if 0
+-void mac_waitbut (void)
+-{
+-	;
+-}
+-#endif
+-
+ /*
+  * 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 @@
+  * console_loglevel determines NMI handler function
+  */
+ 
+-extern irqreturn_t mac_bang(int, void *, struct pt_regs *);
+ 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
+@@ -25,7 +25,6 @@
+ #include <linux/init.h>
+ #include <linux/ide.h>
+ 
+-#include <asm/traps.h>
+ #include <asm/bootinfo.h>
+ #include <asm/macintosh.h>
+ #include <asm/macints.h>
+@@ -71,7 +70,6 @@
+ void via_irq_disable(int irq);
+ void via_irq_clear(int irq);
+ 
+-extern irqreturn_t mac_bang(int, void *, struct pt_regs *);
+ extern irqreturn_t mac_scc_dispatch(int, void *, struct pt_regs *);
+ extern int oss_present;
+ 
+@@ -270,12 +268,6 @@
+ 		request_irq(IRQ_AUTO_1, via1_irq,
+ 				IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
+ 				(void *) via1);
+-#if 0 /* interferes with serial on some machines */
+-		if (!psc_present) {
+-			request_irq(IRQ_AUTO_6, mac_bang, IRQ_FLG_LOCK,
+-					"Off Switch", mac_bang);
+-		}
+-#endif
+ 	}
+ 	request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
+ 			"via2", (void *) via2);
+@@ -471,8 +463,8 @@
+ 	for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
+ 		if (events & irq_bit) {
+ 			via2[gIER] = irq_bit;
+-			m68k_handle_int(VIA2_SOURCE_BASE + i, regs);
+ 			via2[gIFR] = irq_bit | rbv_clear;
++			m68k_handle_int(VIA2_SOURCE_BASE + i, regs);
+ 			via2[gIER] = irq_bit | 0x80;
+ 		}
+ 	return IRQ_HANDLED;
+@@ -529,6 +521,7 @@
+ 		}
+ 		via2[gIER] = irq_bit | 0x80;
+ 	} else if (irq_src == 7) {
++		nubus_active |= irq_bit;
+ 		if (rbv_present) {
+ 			/* enable the slot interrupt. SIER works like IER. */
+ 			via2[rSIER] = IER_SET_BIT(irq_idx);
+@@ -550,7 +543,6 @@
+ 				}
+ 			}
+ 		}
+-		nubus_active |= irq_bit;
+ 	}
+ }
+ 

Added: dists/sid/linux-2.6/debian/patches/series/15-extra
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/15-extra	Tue May 23 22:00:27 2006
@@ -0,0 +1,2 @@
+#+ m68k-dma.patch m68k
+#+ m68k-via2-scsi.patch m68k