From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrew Morton <akpm@osdl.org>
Cc: Pavel Machek <pavel@ucw.cz>, LKML <linux-kernel@vger.kernel.org>,
Nigel Cunningham <ncunningham@linuxmail.org>
Subject: [PATCH 4/4] swsusp: Fix labels
Date: Sat, 18 Nov 2006 23:51:01 +0100 [thread overview]
Message-ID: <200611182351.01924.rjw@sisk.pl> (raw)
In-Reply-To: <200611182335.27453.rjw@sisk.pl>
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>
---
kernel/power/disk.c | 6 +++---
kernel/power/snapshot.c | 8 ++++----
kernel/power/swap.c | 4 ++--
kernel/power/swsusp.c | 2 +-
kernel/power/user.c | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
Index: linux-2.6.19-rc5-mm2/kernel/power/disk.c
===================================================================
--- linux-2.6.19-rc5-mm2.orig/kernel/power/disk.c
+++ linux-2.6.19-rc5-mm2/kernel/power/disk.c
@@ -119,9 +119,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;
@@ -394,7 +394,7 @@ static ssize_t resume_store(struct subsy
noresume = 0;
software_resume();
ret = n;
-out:
+ out:
return ret;
}
Index: linux-2.6.19-rc5-mm2/kernel/power/snapshot.c
===================================================================
--- linux-2.6.19-rc5-mm2.orig/kernel/power/snapshot.c
+++ linux-2.6.19-rc5-mm2/kernel/power/snapshot.c
@@ -411,7 +411,7 @@ memory_bm_create(struct memory_bitmap *b
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(
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_
}
return 0;
-Free:
+ Free:
swsusp_free();
return -ENOMEM;
}
@@ -1540,7 +1540,7 @@ prepare_image(struct memory_bitmap *new_
}
return 0;
-Free:
+ Free:
swsusp_free();
return error;
}
Index: linux-2.6.19-rc5-mm2/kernel/power/swsusp.c
===================================================================
--- linux-2.6.19-rc5-mm2.orig/kernel/power/swsusp.c
+++ linux-2.6.19-rc5-mm2/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;
}
Index: linux-2.6.19-rc5-mm2/kernel/power/user.c
===================================================================
--- linux-2.6.19-rc5-mm2.orig/kernel/power/user.c
+++ linux-2.6.19-rc5-mm2/kernel/power/user.c
@@ -313,7 +313,7 @@ static int snapshot_ioctl(struct inode *
if (pm_ops->finish)
pm_ops->finish(PM_SUSPEND_MEM);
-OutS3:
+ OutS3:
up(&pm_sem);
break;
Index: linux-2.6.19-rc5-mm2/kernel/power/swap.c
===================================================================
--- linux-2.6.19-rc5-mm2.orig/kernel/power/swap.c
+++ linux-2.6.19-rc5-mm2/kernel/power/swap.c
@@ -301,7 +301,7 @@ static int swap_write_page(struct swap_m
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;
}
next prev parent reply other threads:[~2006-11-18 22:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-18 22:35 [PATCH 0/4] swsusp cleanups Rafael J. Wysocki
2006-11-18 22:47 ` [PATCH 1/4] swsusp: Untangle thaw_processes Rafael J. Wysocki
2006-11-18 23:03 ` Nigel Cunningham
2006-11-19 2:04 ` Pavel Machek
2006-11-19 12:01 ` Rafael J. Wysocki
2006-11-19 21:16 ` Pavel Machek
2006-11-18 22:47 ` [PATCH 2/4] swsusp: Untangle freeze_processes Rafael J. Wysocki
2006-11-19 2:09 ` Pavel Machek
2006-11-19 12:05 ` Rafael J. Wysocki
2006-11-19 21:17 ` Pavel Machek
2006-11-18 22:48 ` [PATCH 3/4] swsusp: Fix coding style in suspend.c Rafael J. Wysocki
2006-11-19 2:05 ` Pavel Machek
2006-11-18 22:51 ` Rafael J. Wysocki [this message]
2006-11-18 23:06 ` [PATCH 4/4] swsusp: Fix labels Nigel Cunningham
2006-11-18 23:25 ` Rafael J. Wysocki
2006-11-22 22:32 ` Randy Dunlap
2006-11-22 22:50 ` Rafael J. Wysocki
2006-11-19 1:46 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200611182351.01924.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ncunningham@linuxmail.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.