Attachment 49896 Details for Bug 113930

[patch] This might help/provide better diagnostics.

delme (text/plain), 1013 bytes, created by Pavel Machek on 2005-09-14 12:37:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Machek

Created: 2005-09-14 12:37:12 UTC

Size: 1013 bytes

patch

obsolete

>diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
>--- a/kernel/power/swsusp.c
>+++ b/kernel/power/swsusp.c
>@@ -922,11 +922,16 @@ static int swsusp_alloc(void)
> 	pr_debug("suspend: (pages needed: %d + %d free: %d)\n",
> 		 nr_copy_pages, PAGES_FOR_IO, nr_free_pages());
> 
>-	if (!enough_free_mem())
>+	if (!enough_free_mem()) {
>+		printk(KERN_ERR "swsusp: Not enough free memory\n");
> 		return -ENOMEM;
>+	}
> 
>-	if (!enough_swap())
>+	if (!enough_swap()) {
>+		printk(KERN_ERR "swsusp: Not enough free swap\n");
> 		return -ENOSPC;
>+	}
>+		
> 
> 	if (!(pagedir_save = alloc_pagedir(nr_copy_pages))) {
> 		printk(KERN_ERR "suspend: Allocating pagedir failed.\n");
>@@ -1037,7 +1042,7 @@ int swsusp_suspend(void)
> 		printk(KERN_ERR "Error %d suspending\n", error);
> 	/* Restore control flow magically appears here */
> 	restore_processor_state();
>-	BUG_ON (nr_copy_pages_check != nr_copy_pages);
>+	BUG_ON (!error && (nr_copy_pages_check != nr_copy_pages));
> 	restore_highmem();
> 	device_power_up();
> 	local_irq_enable();

Actions: View | Diff

Attachments on bug 113930: 48047 | 48048 | 49748 | 49749 | 49896 | 49991