diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-12-06 23:34:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:28 -0500 |
commit | 59a493350e7aefff7e262efa39e017517b31b8e8 (patch) | |
tree | c707e294afd5f6b015844257a044c5f62fef7025 /kernel/power/snapshot.c | |
parent | 5b6d15de2d4c8149902a680a6cd1d3b26cd2e828 (diff) |
[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/snapshot.c')
-rw-r--r-- | kernel/power/snapshot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 712f1524d846..c024606221c4 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
@@ -411,7 +411,7 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed) | |||
411 | memory_bm_position_reset(bm); | 411 | memory_bm_position_reset(bm); |
412 | return 0; | 412 | return 0; |
413 | 413 | ||
414 | Free: | 414 | Free: |
415 | bm->p_list = ca.chain; | 415 | bm->p_list = ca.chain; |
416 | memory_bm_free(bm, PG_UNSAFE_CLEAR); | 416 | memory_bm_free(bm, PG_UNSAFE_CLEAR); |
417 | return -ENOMEM; | 417 | return -ENOMEM; |
@@ -557,7 +557,7 @@ static unsigned long memory_bm_next_pfn(struct memory_bitmap *bm) | |||
557 | memory_bm_position_reset(bm); | 557 | memory_bm_position_reset(bm); |
558 | return BM_END_OF_MAP; | 558 | return BM_END_OF_MAP; |
559 | 559 | ||
560 | Return_pfn: | 560 | Return_pfn: |
561 | bm->cur.chunk = chunk; | 561 | bm->cur.chunk = chunk; |
562 | bm->cur.bit = bit; | 562 | bm->cur.bit = bit; |
563 | return bb->start_pfn + chunk * BM_BITS_PER_CHUNK + bit; | 563 | return bb->start_pfn + chunk * BM_BITS_PER_CHUNK + bit; |
@@ -964,7 +964,7 @@ swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, | |||
964 | } | 964 | } |
965 | return 0; | 965 | return 0; |
966 | 966 | ||
967 | Free: | 967 | Free: |
968 | swsusp_free(); | 968 | swsusp_free(); |
969 | return -ENOMEM; | 969 | return -ENOMEM; |
970 | } | 970 | } |
@@ -1540,7 +1540,7 @@ prepare_image(struct memory_bitmap *new_bm, struct memory_bitmap *bm) | |||
1540 | } | 1540 | } |
1541 | return 0; | 1541 | return 0; |
1542 | 1542 | ||
1543 | Free: | 1543 | Free: |
1544 | swsusp_free(); | 1544 | swsusp_free(); |
1545 | return error; | 1545 | return error; |
1546 | } | 1546 | } |