aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-12-06 20:34:44 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:28 -0800
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 08d9e7aac0f..126dda61f45 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;
}
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 712f1524d84..c024606221c 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)
memory_bm_position_reset(bm);
return 0;
-Free:
+ Free:
bm->p_list = ca.chain;
memory_bm_free(bm, PG_UNSAFE_CLEAR);
return -ENOMEM;
@@ -557,7 +557,7 @@ static unsigned long memory_bm_next_pfn(struct memory_bitmap *bm)
memory_bm_position_reset(bm);
return BM_END_OF_MAP;
-Return_pfn:
+ Return_pfn:
bm->cur.chunk = chunk;
bm->cur.bit = 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,
}
return 0;
-Free:
+ Free:
swsusp_free();
return -ENOMEM;
}
@@ -1540,7 +1540,7 @@ prepare_image(struct memory_bitmap *new_bm, struct memory_bitmap *bm)
}
return 0;
-Free:
+ Free:
swsusp_free();
return error;
}
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index dedf8797b72..f133d4a6d81 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,
handle->cur_swap = offset;
handle->k = 0;
}
-out:
+ out:
return error;
}
@@ -429,7 +429,7 @@ int swsusp_write(void)
if (error)
free_all_swap_pages(root_swap, handle.bitmap);
release_swap_writer(&handle);
-out:
+ out:
swsusp_close();
return error;
}
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index aa31432bbd9..31aa0390c77 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -288,7 +288,7 @@ int swsusp_suspend(void)
* that suspended with irqs off ... no overall powerup.
*/
device_power_up();
-Enable_irqs:
+ Enable_irqs:
local_irq_enable();
return error;
}
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 905dc269c3f..069732e5695 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,
if (pm_ops->finish)
pm_ops->finish(PM_SUSPEND_MEM);
-OutS3:
+ OutS3:
mutex_unlock(&pm_mutex);
break;