Skip to content

Commit

Permalink
Revert "PM / hibernate: avoid unsafe pages in e820 reserved regions"
Browse files Browse the repository at this point in the history
Commit 84c91b7 (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@porcupinefactory.org>
Cc: 3.17+ <stable@vger.kernel.org> # 3.17+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Apr 6, 2015
1 parent e42391c commit f82daee
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions kernel/power/snapshot.c
Original file line number Diff line number Diff line change
Expand Up @@ -955,25 +955,6 @@ static void mark_nosave_pages(struct memory_bitmap *bm)
}
}

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
Expand Down Expand Up @@ -2042,7 +2023,7 @@ static int mark_unsafe_pages(struct memory_bitmap *bm)
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;
Expand Down

0 comments on commit f82daee

Please sign in to comment.