diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-11-07 03:58:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:29 -0500 |
commit | 47b90ffe5c10ab9b5cfd14087b28b13109673ee5 (patch) | |
tree | 423c789290ef8eada4916f540c3e8f0be06316d1 /kernel/power/swsusp.c | |
parent | dc19d507b17135069d9c5d6093d4458dc60e1861 (diff) |
[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>
Diffstat (limited to 'kernel/power/swsusp.c')
-rw-r--r-- | kernel/power/swsusp.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index a1300717dc3f..e1ab28b9b217 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c | |||
@@ -85,18 +85,11 @@ unsigned int nr_copy_pages __nosavedata = 0; | |||
85 | /* Suspend pagedir is allocated before final copy, therefore it | 85 | /* Suspend pagedir is allocated before final copy, therefore it |
86 | must be freed after resume | 86 | must be freed after resume |
87 | 87 | ||
88 | Warning: this is evil. There are actually two pagedirs at time of | ||
89 | resume. One is "pagedir_save", which is empty frame allocated at | ||
90 | time of suspend, that must be freed. Second is "pagedir_nosave", | ||
91 | allocated at time of resume, that travels through memory not to | ||
92 | collide with anything. | ||
93 | |||
94 | Warning: this is even more evil than it seems. Pagedirs this file | 88 | Warning: this is even more evil than it seems. Pagedirs this file |
95 | talks about are completely different from page directories used by | 89 | talks about are completely different from page directories used by |
96 | MMU hardware. | 90 | MMU hardware. |
97 | */ | 91 | */ |
98 | suspend_pagedir_t *pagedir_nosave __nosavedata = NULL; | 92 | suspend_pagedir_t *pagedir_nosave __nosavedata = NULL; |
99 | suspend_pagedir_t *pagedir_save; | ||
100 | 93 | ||
101 | #define SWSUSP_SIG "S1SUSPEND" | 94 | #define SWSUSP_SIG "S1SUSPEND" |
102 | 95 | ||
@@ -385,7 +378,7 @@ static void data_free(void) | |||
385 | swp_entry_t entry; | 378 | swp_entry_t entry; |
386 | struct pbe *p; | 379 | struct pbe *p; |
387 | 380 | ||
388 | for_each_pbe(p, pagedir_nosave) { | 381 | for_each_pbe (p, pagedir_nosave) { |
389 | entry = p->swap_address; | 382 | entry = p->swap_address; |
390 | if (entry.val) | 383 | if (entry.val) |
391 | swap_free(entry); | 384 | swap_free(entry); |