r1235 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

[Christoph Hellwig]

Author: hch-guest
Date: 2004-08-18 15:43:40 -0600 (Wed, 18 Aug 2004)
New Revision: 1235

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/pmac-no-of-stdout.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
Log:

  * Fix early boot crash on some oldworld Power Macs. (closes: #266731)



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-18 20:31:37 UTC (rev 1234)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-18 21:43:40 UTC (rev 1235)
@@ -12,6 +12,9 @@
   * Claim we're Windows (TM) to ACPI to work around broken BIOSes
     (Christoph Hellwig).
 
+  * Fix early boot crash on some oldworld Power Macs. (closes: #266731)
+    (Christoph Hellwig).
+
  -- Andres Salomon <dilinger@voxel.net>  Wed, 18 Aug 2004 02:13:56 -0400
 
 kernel-source-2.6.8 (2.6.8-2) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-18 20:31:37 UTC (rev 1234)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-18 21:43:40 UTC (rev 1235)
@@ -35,3 +35,4 @@
 bio_uncopy_user-memleak
 scsi-blacklist
 acpi-osname
+pmac-no-of-stdout

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/pmac-no-of-stdout.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/pmac-no-of-stdout.dpatch	2004-08-18 20:31:37 UTC (rev 1234)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/pmac-no-of-stdout.dpatch	2004-08-18 21:43:40 UTC (rev 1235)
@@ -0,0 +1,23 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix oldworld pmacs that don't have an OF stdout
+## DP: Patch author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+## DP: Upstream status: unknown
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- 1.59/arch/ppc/kernel/setup.c	2004-07-27 00:27:53 +02:00
++++ edited/arch/ppc/kernel/setup.c	2004-08-18 23:42:12 +02:00
+@@ -484,6 +484,9 @@
+ 	char *name;
+ 	int offset;
+ 
++	if (of_stdout_device == NULL)
++		return -ENODEV;
++
+ 	/* The user has requested a console so this is already set up. */
+ 	if (strstr(saved_command_line, "console="))
+ 		return -EBUSY;