Commit 59a49335 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

[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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5b6d15de
...@@ -117,9 +117,9 @@ static int prepare_processes(void) ...@@ -117,9 +117,9 @@ static int prepare_processes(void)
return 0; return 0;
platform_finish(); platform_finish();
thaw: thaw:
thaw_processes(); thaw_processes();
enable_cpus: enable_cpus:
enable_nonboot_cpus(); enable_nonboot_cpus();
pm_restore_console(); pm_restore_console();
return error; return error;
...@@ -392,7 +392,7 @@ static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n) ...@@ -392,7 +392,7 @@ static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n)
noresume = 0; noresume = 0;
software_resume(); software_resume();
ret = n; ret = n;
out: out:
return ret; return ret;
} }
......
...@@ -411,7 +411,7 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed) ...@@ -411,7 +411,7 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
memory_bm_position_reset(bm); memory_bm_position_reset(bm);
return 0; return 0;
Free: Free:
bm->p_list = ca.chain; bm->p_list = ca.chain;
memory_bm_free(bm, PG_UNSAFE_CLEAR); memory_bm_free(bm, PG_UNSAFE_CLEAR);
return -ENOMEM; return -ENOMEM;
...@@ -557,7 +557,7 @@ static unsigned long memory_bm_next_pfn(struct memory_bitmap *bm) ...@@ -557,7 +557,7 @@ static unsigned long memory_bm_next_pfn(struct memory_bitmap *bm)
memory_bm_position_reset(bm); memory_bm_position_reset(bm);
return BM_END_OF_MAP; return BM_END_OF_MAP;
Return_pfn: Return_pfn:
bm->cur.chunk = chunk; bm->cur.chunk = chunk;
bm->cur.bit = bit; bm->cur.bit = bit;
return bb->start_pfn + chunk * BM_BITS_PER_CHUNK + bit; 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,7 +964,7 @@ swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm,
} }
return 0; return 0;
Free: Free:
swsusp_free(); swsusp_free();
return -ENOMEM; return -ENOMEM;
} }
...@@ -1540,7 +1540,7 @@ prepare_image(struct memory_bitmap *new_bm, struct memory_bitmap *bm) ...@@ -1540,7 +1540,7 @@ prepare_image(struct memory_bitmap *new_bm, struct memory_bitmap *bm)
} }
return 0; return 0;
Free: Free:
swsusp_free(); swsusp_free();
return error; return error;
} }
......
...@@ -301,7 +301,7 @@ static int swap_write_page(struct swap_map_handle *handle, void *buf, ...@@ -301,7 +301,7 @@ static int swap_write_page(struct swap_map_handle *handle, void *buf,
handle->cur_swap = offset; handle->cur_swap = offset;
handle->k = 0; handle->k = 0;
} }
out: out:
return error; return error;
} }
...@@ -429,7 +429,7 @@ int swsusp_write(void) ...@@ -429,7 +429,7 @@ int swsusp_write(void)
if (error) if (error)
free_all_swap_pages(root_swap, handle.bitmap); free_all_swap_pages(root_swap, handle.bitmap);
release_swap_writer(&handle); release_swap_writer(&handle);
out: out:
swsusp_close(); swsusp_close();
return error; return error;
} }
......
...@@ -288,7 +288,7 @@ int swsusp_suspend(void) ...@@ -288,7 +288,7 @@ int swsusp_suspend(void)
* that suspended with irqs off ... no overall powerup. * that suspended with irqs off ... no overall powerup.
*/ */
device_power_up(); device_power_up();
Enable_irqs: Enable_irqs:
local_irq_enable(); local_irq_enable();
return error; return error;
} }
......
...@@ -313,7 +313,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, ...@@ -313,7 +313,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
if (pm_ops->finish) if (pm_ops->finish)
pm_ops->finish(PM_SUSPEND_MEM); pm_ops->finish(PM_SUSPEND_MEM);
OutS3: OutS3:
mutex_unlock(&pm_mutex); mutex_unlock(&pm_mutex);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment