From 2e52a241ab026cde47f6edf927b0097f0b953b13 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Thu, 24 Sep 2009 12:06:51 +0000
Subject: [PATCH] Turn off EARLY_PRINTK on IP22 to make the system boot

svn path=/dists/trunk/linux-2.6/; revision=14284
---
 debian/changelog                              |  2 ++
 .../bugfix/mips/ip22-no-early-printk.patch    | 22 +++++++++++++++++++
 debian/patches/series/base                    |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 debian/patches/bugfix/mips/ip22-no-early-printk.patch

diff --git a/debian/changelog b/debian/changelog
index ab36e29a9..56e2a544a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,8 @@ linux-2.6 (2.6.31-1~experimental.1) UNRELEASED; urgency=low
   * Add features from 2.6.32:
     - crypto: mv_cesa - Add support for Orion5X crypto engine
   * [armel/orion5x] Enable CRYPTO_DEV_MV_CESA.
+  * Disable SYS_HAS_EARLY_PRINTK on SGI IP22 to work around a hang
+    during bootup (Closes: #507557)
 
   [ Bastian Blank ]
   * Disable staging drivers by default.
diff --git a/debian/patches/bugfix/mips/ip22-no-early-printk.patch b/debian/patches/bugfix/mips/ip22-no-early-printk.patch
new file mode 100644
index 000000000..801a99ed4
--- /dev/null
+++ b/debian/patches/bugfix/mips/ip22-no-early-printk.patch
@@ -0,0 +1,22 @@
+Subject: Turn off EARLY_PRINTK on IP22 to make the system boot
+
+Thomas Bogendoerfer: current kernels are not working on that machine
+due to some bad interaction between CONFIG_EARLY_PRINTK and
+overwritten prom memory during early boot (this bug is on my
+todo list.
+
+In the meantime, turn off CONFIG_EARLY_PRINTK on IP22.
+
+Debian bug #507557
+
+--- a/arch/mips/Kconfig	2009-09-22 09:22:46.000000000 +0000
++++ b/arch/mips/Kconfig	2009-09-22 09:22:59.000000000 +0000
+@@ -357,7 +357,6 @@
+ 	select SWAP_IO_SPACE
+ 	select SYS_HAS_CPU_R4X00
+ 	select SYS_HAS_CPU_R5000
+-	select SYS_HAS_EARLY_PRINTK
+ 	select SYS_SUPPORTS_32BIT_KERNEL
+ 	select SYS_SUPPORTS_64BIT_KERNEL
+ 	select SYS_SUPPORTS_BIG_ENDIAN
+
diff --git a/debian/patches/series/base b/debian/patches/series/base
index c5b654ca6..538d35fb9 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -19,6 +19,7 @@
 + bugfix/sparc/drivers_net-broken.patch
 #+ bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
++ bugfix/mips/ip22-no-early-printk.patch
 + bugfix/arm/disable-scsi_acard.patch
 + bugfix/mips/disable-werror.patch
 + bugfix/fix-hifn_795X-divdi3.patch