[kernel] r7434 - in dists/trunk/linux-2.6/debian: . patches patches/series

[Sven Luther]

Author: luther
Date: Sun Sep 17 22:24:28 2006
New Revision: 7434

Added:
   dists/trunk/linux-2.6/debian/patches/powerpc-hvc_console-suspend-fix.patch
   dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.patch
      - copied unchanged from r7431, /dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.diff
Removed:
   dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.diff
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
Added hvc-console powerbook suspend-to-disk fix (Closes: #387178)
Renamed oldworld-boot-fix to .patch.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Sep 17 22:24:28 2006
@@ -23,6 +23,8 @@
   * [powerpc] Added tentative patch to fix oldworld ramdisk size bug. 
     Thanks fo to Christian Aichinger for investigating and providing the
     patch. (Closes: #366620, #375035).
+  * [powerpc] Fixes hvc_console caused suspsend-to-disk breakage. Thanks to
+    Andrew Morton for providing the patch. (Closes: #387178)
 
   [ Frederik Schüler ]
   * Remove obsolete options from amd64 and i386 configs.

Added: dists/trunk/linux-2.6/debian/patches/powerpc-hvc_console-suspend-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-hvc_console-suspend-fix.patch	Sun Sep 17 22:24:28 2006
@@ -0,0 +1,20 @@
+From: Andrew Morton <akpm at osdl.org>
+
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ drivers/char/hvc_console.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff -puN drivers/char/hvc_console.c~hvc_console-suspend-fix drivers/char/hvc_console.c
+--- a/drivers/char/hvc_console.c~hvc_console-suspend-fix
++++ a/drivers/char/hvc_console.c
+@@ -669,6 +669,7 @@ int khvcd(void *unused)
+ 	do {
+ 		poll_mask = 0;
+ 		hvc_kicked = 0;
++		try_to_freeze();
+ 		wmb();
+ 		if (cpus_empty(cpus_in_xmon)) {
+ 			spin_lock(&hvc_structs_lock);
+_

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Sun Sep 17 22:24:28 2006
@@ -30,4 +30,5 @@
 + arm-iop-fix-cpuid
 + arm-get_unaligned-gcc41-const.patch
 + powerpc-serial.patch
-+ powerpc-oldworld-boot-fix.diff
++ powerpc-oldworld-boot-fix.patch
++ powerpc-hvc_console-suspend-fix.patch