Browse Source

[PATCH] swsusp: fix comments

Fix comments in swsusp.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pavel Machek 20 years ago
parent
commit
8686bcd0a5
2 changed files with 8 additions and 4 deletions
  1. 1 1
      kernel/power/power.h
  2. 7 3
      kernel/power/swsusp.c

+ 1 - 1
kernel/power/power.h

@@ -1,7 +1,7 @@
 #include <linux/suspend.h>
 #include <linux/suspend.h>
 #include <linux/utsname.h>
 #include <linux/utsname.h>
 
 
-/* With SUSPEND_CONSOLE defined, it suspend looks *really* cool, but
+/* With SUSPEND_CONSOLE defined suspend looks *really* cool, but
    we probably do not take enough locks for switching consoles, etc,
    we probably do not take enough locks for switching consoles, etc,
    so bad things might happen.
    so bad things might happen.
 */
 */

+ 7 - 3
kernel/power/swsusp.c

@@ -363,7 +363,7 @@ static void lock_swapdevices(void)
 }
 }
 
 
 /**
 /**
- *	write_swap_page - Write one page to a fresh swap location.
+ *	write_page - Write one page to a fresh swap location.
  *	@addr:	Address we're writing.
  *	@addr:	Address we're writing.
  *	@loc:	Place to store the entry we used.
  *	@loc:	Place to store the entry we used.
  *
  *
@@ -863,6 +863,9 @@ static int alloc_image_pages(void)
 	return 0;
 	return 0;
 }
 }
 
 
+/* Free pages we allocated for suspend. Suspend pages are alocated
+ * before atomic copy, so we need to free them after resume.
+ */
 void swsusp_free(void)
 void swsusp_free(void)
 {
 {
 	BUG_ON(PageNosave(virt_to_page(pagedir_save)));
 	BUG_ON(PageNosave(virt_to_page(pagedir_save)));
@@ -1213,8 +1216,9 @@ static struct pbe * swsusp_pagedir_relocate(struct pbe *pblist)
 		free_pagedir(pblist);
 		free_pagedir(pblist);
 		free_eaten_memory();
 		free_eaten_memory();
 		pblist = NULL;
 		pblist = NULL;
-	}
-	else
+		/* Is this even worth handling? It should never ever happen, and we
+		   have just lost user's state, anyway... */
+	} else
 		printk("swsusp: Relocated %d pages\n", rel);
 		printk("swsusp: Relocated %d pages\n", rel);
 
 
 	return pblist;
 	return pblist;