summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-11-07 00:58:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:29 -0800
commit47b90ffe5c10ab9b5cfd14087b28b13109673ee5 (patch)
tree423c789290ef8eada4916f540c3e8f0be06316d1 /kernel/power
parentdc19d507b17135069d9c5d6093d4458dc60e1861 (diff)
downloadlwn-47b90ffe5c10ab9b5cfd14087b28b13109673ee5.tar.gz
lwn-47b90ffe5c10ab9b5cfd14087b28b13109673ee5.zip
[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')
-rw-r--r--kernel/power/swsusp.c9
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;
/* Suspend pagedir is allocated before final copy, therefore it
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
talks about are completely different from page directories used by
MMU hardware.
*/
suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
-suspend_pagedir_t *pagedir_save;
#define SWSUSP_SIG "S1SUSPEND"
@@ -385,7 +378,7 @@ static void data_free(void)
swp_entry_t entry;
struct pbe *p;
- for_each_pbe(p, pagedir_nosave) {
+ for_each_pbe (p, pagedir_nosave) {
entry = p->swap_address;
if (entry.val)
swap_free(entry);