The patch titled
swsusp: fix panic when signature can't be read
has been added to the -mm tree. Its filename is
fix-panic-when-swsusp-signature-cant-be-read.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: swsusp: fix panic when signature can't be read
From: Linus Torvalds <torvalds@xxxxxxxx>
Do not panic a machine when swsusp signature can't be read.
Signed-off-by: Pavel Machek <pavel@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/power/swap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN kernel/power/swap.c~fix-panic-when-swsusp-signature-cant-be-read kernel/power/swap.c
--- a/kernel/power/swap.c~fix-panic-when-swsusp-signature-cant-be-read
+++ a/kernel/power/swap.c
@@ -311,8 +311,10 @@ static atomic_t io_done = ATOMIC_INIT(0)
static int end_io(struct bio *bio, unsigned int num, int err)
{
- if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
- panic("I/O error reading memory image");
+ if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {
+ printk(KERN_ERR "I/O error reading swsusp image.\n");
+ return -EIO;
+ }
atomic_set(&io_done, 0);
return 0;
}
_
Patches currently in -mm which might be from torvalds@xxxxxxxx are
revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch
fix-panic-when-swsusp-signature-cant-be-read.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
