[kernel] r7397 - in dists/sid/linux-2.6/debian: . patches

[Sven Luther]

Author: luther
Date: Wed Sep 13 17:17:32 2006
New Revision: 7397

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch
   dists/sid/linux-2.6/debian/patches/powerpc-serial.patch

Log:
Added Mark Hymers's forward port of the powerpc serial patch, disabling it on powermacs.
Reenabled the pegasos isa ranges patch, now that i fixed and tested it :/
Moved changelog entry from already released 9 to 10.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Sep 13 17:17:32 2006
@@ -1,3 +1,13 @@
+linux-2.6 (2.6.17-10) UNRELEASED; urgency=low
+
+  [ Sven Luther ]
+  * [powerpc] now builtin sisfb, so sis/xgi users get a framebuffer device.
+  * [powerpc] prom-init patch, to work around broken pegasos isa ranges.
+  * [powerpc] added disabling of the serial driver on powermacs, courtesy of
+    Mark Hymers.
+
+ -- Sven Luther <sven at tael.powerlinux.fr>  Wed, 13 Sep 2006 19:12:19 +0200
+
 linux-2.6 (2.6.17-9) unstable; urgency=medium
 
   [ Bastian Blank ]
@@ -49,9 +59,6 @@
     - s390-kernel-futex-barrier.patch
   * Unpatch ia64-mman.h-fix.patch
 
-  [ Sven Luther ]
-  * [powerpc] now builtin sisfb, so sis/xgi users get a framebuffer device.
-
  -- Sven Luther <sven at tael.powerlinux.fr>  Wed, 13 Sep 2006 19:07:25 +0200
 
 linux-2.6 (2.6.17-8) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch	Wed Sep 13 17:17:32 2006
@@ -14,17 +14,7 @@
 
 --- linux-2.6.17.11/arch/powerpc/kernel/prom_init.c.orig	2006-09-10 11:04:34.000000000 +0200
 +++ linux-2.6.17.11/arch/powerpc/kernel/prom_init.c	2006-09-10 11:09:26.000000000 +0200
-@@ -565,7 +565,9 @@
- static void __init early_cmdline_parse(void)
- {
- 	struct prom_t *_prom = &RELOC(prom);
-+#ifdef CONFIG_PPC64
- 	const char *opt;
-+#endif
- 	char *p;
- 	int l = 0;
- 
-@@ -2103,6 +2105,37 @@
+@@ -2101,6 +2103,38 @@
  #define fixup_device_tree_maple()
  #endif
  
@@ -55,6 +45,7 @@
 +	isa_ranges[5] = 0x00010000;
 +	prom_setprop(isa, name, "ranges",
 +		isa_ranges, sizeof(isa_ranges));
++}
 +#else
 +#define fixup_device_tree_chrp()
 +#endif

Modified: dists/sid/linux-2.6/debian/patches/powerpc-serial.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/powerpc-serial.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/powerpc-serial.patch	Wed Sep 13 17:17:32 2006
@@ -4,28 +4,29 @@
 ## DP: Description: Disables legacy serial driver on powermacs.
 ## DP: Patch author: Sven Luther <luther at debian.org> 
 ## DP: Patch author: adapted from the SuSE kernel tree.
+## DP: Forward ported to 2.6.17 by Mark Hymers <mark at hymers.org.uk>
 ## DP: Upstream status: workaround hack waiting for a clean legacy device solution.
 
 diff -aurN a/drivers/serial/8250.c b/drivers/serial/8250.c
 --- a/drivers/serial/8250.c	2005-06-17 15:48:29.000000000 -0400
 +++ b/drivers/serial/8250.c	2005-06-18 12:05:39.000000000 -0400
-@@ -46,6 +46,10 @@
+@@ -45,6 +45,10 @@
+ #include <asm/io.h>
+ #include <asm/irq.h>
  
- #include "8250.h"
- 
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+#include <asm/processor.h>
++#ifdef CONFIG_PPC_PMAC
++#include <asm/machdep.h>
 +#endif
 +
+ #include "8250.h"
+ 
  /*
-  * Configuration:
-  *   share_irqs - whether we pass SA_SHIRQ to request_irq().  This option
-@@ -2188,6 +2192,12 @@
+@@ -2307,6 +2312,12 @@
  
  static int __init serial8250_console_init(void)
  {
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+	if(_machine == _MACH_Pmac) {
++#ifdef CONFIG_PPC_PMAC
++	if(machine_is(powermac)) {
 +		printk("%s: nothing to do on PowerMac\n",__FUNCTION__);
 +		return -ENODEV;
 +	}
@@ -33,16 +34,17 @@
  	serial8250_isa_init_ports();
  	register_console(&serial8250_console);
  	return 0;
-@@ -2491,6 +2501,12 @@
+@@ -2617,6 +2628,13 @@
  {
  	int ret, i;
  
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+	if(_machine == _MACH_Pmac) {
-+		printk("%s: nothing to do on PowerMac\n",__FUNCTION__);
-+		return -ENODEV;
-+	}
++#ifdef CONFIG_PPC_PMAC
++    if(machine_is(powermac)) {
++        printk("%s: nothing to do on PowerMac\n",__FUNCTION__);
++        return -ENODEV;
++    }
 +#endif
- 	printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
- 		"%d ports, IRQ sharing %sabled\n", (int) UART_NR,
- 		share_irqs ? "en" : "dis");
++
+ 	if (nr_uarts > UART_NR)
+ 		nr_uarts = UART_NR;
+