This is a note to let you know that I've just added the patch titled
Revert "PM / hibernate: avoid unsafe pages in e820 reserved regions"
to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-pm-hibernate-avoid-unsafe-pages-in-e820-reserved-regions.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f82daee49c09cf6a99c28303d93438a2566e5552 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
Date: Tue, 7 Apr 2015 01:07:39 +0200
Subject: Revert "PM / hibernate: avoid unsafe pages in e820 reserved regions"
From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
commit f82daee49c09cf6a99c28303d93438a2566e5552 upstream.
Commit 84c91b7ae07c (PM / hibernate: avoid unsafe pages in e820 reserved
regions) is reported to make resume from hibernation on Lenovo x230
unreliable, so revert it.
We will revisit the issue the commit in question was supposed to fix
in the future.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96111
Reported-by: rhn <kebuac.rhn@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/power/snapshot.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -955,25 +955,6 @@ static void mark_nosave_pages(struct mem
}
}
-static bool is_nosave_page(unsigned long pfn)
-{
- struct nosave_region *region;
-
- list_for_each_entry(region, &nosave_regions, list) {
- if (pfn >= region->start_pfn && pfn < region->end_pfn) {
- pr_err("PM: %#010llx in e820 nosave region: "
- "[mem %#010llx-%#010llx]\n",
- (unsigned long long) pfn << PAGE_SHIFT,
- (unsigned long long) region->start_pfn << PAGE_SHIFT,
- ((unsigned long long) region->end_pfn << PAGE_SHIFT)
- - 1);
- return true;
- }
- }
-
- return false;
-}
-
/**
* create_basic_memory_bitmaps - create bitmaps needed for marking page
* frames that should not be saved and free page frames. The pointers
@@ -2039,7 +2020,7 @@ static int mark_unsafe_pages(struct memo
do {
pfn = memory_bm_next_pfn(bm);
if (likely(pfn != BM_END_OF_MAP)) {
- if (likely(pfn_valid(pfn)) && !is_nosave_page(pfn))
+ if (likely(pfn_valid(pfn)))
swsusp_set_page_free(pfn_to_page(pfn));
else
return -EFAULT;
Patches currently in stable-queue which might be from rafael.j.wysocki@xxxxxxxxx are
queue-3.19/cpufreq-schedule-work-for-the-first-online-cpu-on-resume.patch
queue-3.19/cpuidle-remove-state_count-field-from-struct-cpuidle_device.patch
queue-3.19/revert-pm-hibernate-avoid-unsafe-pages-in-e820-reserved-regions.patch
queue-3.19/cpuidle-acpi-do-not-overwrite-name-and-description-of-c0.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html