浏览代码

[PATCH] swsusp: remove unused variable

Remove unused variable, and make code less evil that way.  Fix whitespace
around for-loop-like macro.

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 年之前
父节点
当前提交
47b90ffe5c
共有 1 个文件被更改,包括 1 次插入8 次删除
  1. 1 8
      kernel/power/swsusp.c

+ 1 - 8
kernel/power/swsusp.c

@@ -85,18 +85,11 @@ unsigned int nr_copy_pages __nosavedata = 0;
 /* Suspend pagedir is allocated before final copy, therefore it
 /* Suspend pagedir is allocated before final copy, therefore it
    must be freed after resume
    must be freed after resume
 
 
-   Warning: this is evil. There are actually two pagedirs at time of
-   resume. One is "pagedir_save", which is empty frame allocated at
-   time of suspend, that must be freed. Second is "pagedir_nosave",
-   allocated at time of resume, that travels through memory not to
-   collide with anything.
-
    Warning: this is even more evil than it seems. Pagedirs this file
    Warning: this is even more evil than it seems. Pagedirs this file
    talks about are completely different from page directories used by
    talks about are completely different from page directories used by
    MMU hardware.
    MMU hardware.
  */
  */
 suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
 suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
-suspend_pagedir_t *pagedir_save;
 
 
 #define SWSUSP_SIG	"S1SUSPEND"
 #define SWSUSP_SIG	"S1SUSPEND"
 
 
@@ -385,7 +378,7 @@ static void data_free(void)
 	swp_entry_t entry;
 	swp_entry_t entry;
 	struct pbe *p;
 	struct pbe *p;
 
 
-	for_each_pbe(p, pagedir_nosave) {
+	for_each_pbe (p, pagedir_nosave) {
 		entry = p->swap_address;
 		entry = p->swap_address;
 		if (entry.val)
 		if (entry.val)
 			swap_free(entry);
 			swap_free(entry);