diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-12-06 20:34:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:28 -0800 |
| commit | 59a493350e7aefff7e262efa39e017517b31b8e8 (patch) | |
| tree | c707e294afd5f6b015844257a044c5f62fef7025 /kernel/power/disk.c | |
| parent | 5b6d15de2d4c8149902a680a6cd1d3b26cd2e828 (diff) | |
| download | blackbird-op-linux-59a493350e7aefff7e262efa39e017517b31b8e8.tar.gz blackbird-op-linux-59a493350e7aefff7e262efa39e017517b31b8e8.zip | |
[PATCH] swsusp: Fix labels
Move all labels in the swsusp code to the second column, so that they won't
fool diff -p.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 08d9e7aac0f8..126dda61f45d 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -117,9 +117,9 @@ static int prepare_processes(void) return 0; platform_finish(); -thaw: + thaw: thaw_processes(); -enable_cpus: + enable_cpus: enable_nonboot_cpus(); pm_restore_console(); return error; @@ -392,7 +392,7 @@ static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n) noresume = 0; software_resume(); ret = n; -out: + out: return ret; } |
