The following patch merges two functions in a trivial way.
Signed-off-by: Rafael J. Wysocki <[email protected]>
Index: linux-2.6.14-rc4-mm1/kernel/power/snapshot.c
===================================================================
--- linux-2.6.14-rc4-mm1.orig/kernel/power/snapshot.c 2005-10-17 23:28:36.000000000 +0200
+++ linux-2.6.14-rc4-mm1/kernel/power/snapshot.c 2005-10-17 23:28:40.000000000 +0200
@@ -384,7 +384,7 @@
return 0;
}
-static int suspend_prepare_image(void)
+asmlinkage int swsusp_save(void)
{
int error;
@@ -433,9 +433,3 @@
printk("swsusp: critical section/: done (%d pages copied)\n", nr_copy_pages );
return 0;
}
-
-
-asmlinkage int swsusp_save(void)
-{
- return suspend_prepare_image();
-}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
