[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>

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 08d9e7aac0f8976a1f26b0c4ad03d070e88a62fa..126dda61f45df1772e1d3a085e33cd11258680d8 100644 (file)
--- 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 712f1524d84656de2503187c56f0703230e1b04c..c024606221c4f9d6dd7ba35f3634f9f944fda23e 100644 (file)
--- 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 dedf8797b723f670b9a96a333226675747661b62..f133d4a6d817bacfc2219476d72be55fb5d8face 100644 (file)
--- 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 aa31432bbd973729686f76160768dbc5d650890c..31aa0390c777d186652fe1b5dc3bfb4aafbaa338 100644 (file)
--- 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 905dc269c3fce952bc4e7b5bd010cc12a7bb4185..069732e5695c86a39bbb501b96366b05abdf2bb1 100644 (file)
--- 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;