From 77d4e1bb4192bf31dd93f353cec54788a78e0c47 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Sun, 17 Sep 2006 22:24:28 +0000 Subject: [PATCH] Added hvc-console powerbook suspend-to-disk fix (Closes: #387178) Renamed oldworld-boot-fix to .patch. svn path=/dists/trunk/linux-2.6/; revision=7434 --- debian/changelog | 2 ++ .../powerpc-hvc_console-suspend-fix.patch | 20 +++++++++++++++++++ ...x.diff => powerpc-oldworld-boot-fix.patch} | 0 debian/patches/series/0experimental.1 | 3 ++- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 debian/patches/powerpc-hvc_console-suspend-fix.patch rename debian/patches/{powerpc-oldworld-boot-fix.diff => powerpc-oldworld-boot-fix.patch} (100%) diff --git a/debian/changelog b/debian/changelog index ac9b9c0b9..2f5e0fcb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ linux-2.6 (2.6.17+2.6.18-rc7-0experimental.1) UNRELEASED; urgency=low * [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. diff --git a/debian/patches/powerpc-hvc_console-suspend-fix.patch b/debian/patches/powerpc-hvc_console-suspend-fix.patch new file mode 100644 index 000000000..47b523b0c --- /dev/null +++ b/debian/patches/powerpc-hvc_console-suspend-fix.patch @@ -0,0 +1,20 @@ +From: Andrew Morton + +Signed-off-by: Andrew Morton +--- + + 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); +_ diff --git a/debian/patches/powerpc-oldworld-boot-fix.diff b/debian/patches/powerpc-oldworld-boot-fix.patch similarity index 100% rename from debian/patches/powerpc-oldworld-boot-fix.diff rename to debian/patches/powerpc-oldworld-boot-fix.patch diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1 index e050ab75e..334be9d10 100644 --- a/debian/patches/series/0experimental.1 +++ b/debian/patches/series/0experimental.1 @@ -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