aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-12-06 23:34:44 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:28 -0500
commit59a493350e7aefff7e262efa39e017517b31b8e8 (patch)
treec707e294afd5f6b015844257a044c5f62fef7025
parent5b6d15de2d4c8149902a680a6cd1d3b26cd2e828 (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>
-rw-r--r--kernel/power/disk.c6
-rw-r--r--kernel/power/snapshot.c8
-rw-r--r--kernel/power/swap.c4
-rw-r--r--kernel/power/swsusp.c2
-rw-r--r--kernel/power/user.c2
5 files changed, 11 insertions, 11 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)
117 return 0; 117 return 0;
118 118
119 platform_finish(); 119 platform_finish();
120thaw: 120 thaw:
121 thaw_processes(); 121 thaw_processes();
122enable_cpus: 122 enable_cpus:
123 enable_nonboot_cpus(); 123 enable_nonboot_cpus();
124 pm_restore_console(); 124 pm_restore_console();
125 return error; 125 return error;
@@ -392,7 +392,7 @@ static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n)
392 noresume = 0; 392 noresume = 0;
393 software_resume(); 393 software_resume();
394 ret = n; 394 ret = n;
395out: 395 out:
396 return ret; 396 return ret;
397} 397}
398 398
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
414Free: 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
560Return_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
967Free: 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
1543Free: 1543 Free:
1544 swsusp_free(); 1544 swsusp_free();
1545 return error; 1545 return error;
1546} 1546}
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index dedf8797b723..f133d4a6d817 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -301,7 +301,7 @@ static int swap_write_page(struct swap_map_handle *handle, void *buf,
301 handle->cur_swap = offset; 301 handle->cur_swap = offset;
302 handle->k = 0; 302 handle->k = 0;
303 } 303 }
304out: 304 out:
305 return error; 305 return error;
306} 306}
307 307
@@ -429,7 +429,7 @@ int swsusp_write(void)
429 if (error) 429 if (error)
430 free_all_swap_pages(root_swap, handle.bitmap); 430 free_all_swap_pages(root_swap, handle.bitmap);
431 release_swap_writer(&handle); 431 release_swap_writer(&handle);
432out: 432 out:
433 swsusp_close(); 433 swsusp_close();
434 return error; 434 return error;
435} 435}
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index aa31432bbd97..31aa0390c777 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -288,7 +288,7 @@ int swsusp_suspend(void)
288 * that suspended with irqs off ... no overall powerup. 288 * that suspended with irqs off ... no overall powerup.
289 */ 289 */
290 device_power_up(); 290 device_power_up();
291Enable_irqs: 291 Enable_irqs:
292 local_irq_enable(); 292 local_irq_enable();
293 return error; 293 return error;
294} 294}
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 905dc269c3fc..069732e5695c 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -313,7 +313,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
313 if (pm_ops->finish) 313 if (pm_ops->finish)
314 pm_ops->finish(PM_SUSPEND_MEM); 314 pm_ops->finish(PM_SUSPEND_MEM);
315 315
316OutS3: 316 OutS3:
317 mutex_unlock(&pm_mutex); 317 mutex_unlock(&pm_mutex);
318 break; 318 break;
319 319