The patch titled
swsusp: Fix labels
has been added to the -mm tree. Its filename is
swsusp-fix-labels.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: swsusp: Fix labels
From: "Rafael J. Wysocki" <rjw@xxxxxxx>
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@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Cc: Nigel Cunningham <nigel@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN kernel/power/disk.c~swsusp-fix-labels kernel/power/disk.c
--- a/kernel/power/disk.c~swsusp-fix-labels
+++ a/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;
}
diff -puN kernel/power/snapshot.c~swsusp-fix-labels kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~swsusp-fix-labels
+++ a/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;
}
diff -puN kernel/power/swap.c~swsusp-fix-labels kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-fix-labels
+++ a/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;
}
diff -puN kernel/power/swsusp.c~swsusp-fix-labels kernel/power/swsusp.c
--- a/kernel/power/swsusp.c~swsusp-fix-labels
+++ a/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 -puN kernel/power/user.c~swsusp-fix-labels kernel/power/user.c
--- a/kernel/power/user.c~swsusp-fix-labels
+++ a/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:
mutex_unlock(&pm_mutex);
break;
_
Patches currently in -mm which might be from rjw@xxxxxxx are
git-acpi.patch
uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch
swsusp-use-partition-device-and-offset-to-identify-swap-areas.patch
swsusp-rearrange-swap-handling-code.patch
swsusp-use-block-device-offsets-to-identify-swap-locations-rev-2.patch
swsusp-add-resume_offset-command-line-parameter-rev-2.patch
swsusp-document-support-for-swap-files-rev-2.patch
swsusp-add-ioctl-for-swap-files-support.patch
swsusp-update-userland-interface-documentation.patch
swsusp-improve-handling-of-highmem.patch
swsusp-improve-handling-of-highmem-fix.patch
swsusp-use-__gfp_wait.patch
swsusp-fix-platform-mode.patch
add-include-linux-freezerh-and-move-definitions-from.patch
add-include-linux-freezerh-and-move-definitions-from-ueagle-fix.patch
quieten-freezer-if-config_pm_debug.patch
swsusp-cleanup-whitespace-in-freezer-output.patch
swsusp-thaw-userspace-and-kernel-space-separately.patch
swsusp-support-i386-systems-with-pae-or-without-pse.patch
suspend-dont-change-cpus_allowed-for-task-initiating-the-suspend.patch
swsusp-measure-memory-shrinking-time.patch
suspend-to-disk-fails-if-gdb-is-suspended-with-a-traced-child.patch
convert-pm_sem-to-a-mutex.patch
swsusp-untangle-thaw_processes.patch
swsusp-untangle-freeze_processes.patch
swsusp-fix-coding-style-in-suspendc.patch
swsusp-fix-labels.patch
support-for-freezeable-workqueues.patch
use-freezeable-workqueues-in-xfs.patch
md-change-lifetime-rules-for-md-devices.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
