diff options
Diffstat (limited to 'kernel/power/snapshot.c')
| -rw-r--r-- | kernel/power/snapshot.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index c24d5a23bf93..5235dd4e1e2f 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
| @@ -955,25 +955,6 @@ static void mark_nosave_pages(struct memory_bitmap *bm) | |||
| 955 | } | 955 | } |
| 956 | } | 956 | } |
| 957 | 957 | ||
| 958 | static bool is_nosave_page(unsigned long pfn) | ||
| 959 | { | ||
| 960 | struct nosave_region *region; | ||
| 961 | |||
| 962 | list_for_each_entry(region, &nosave_regions, list) { | ||
| 963 | if (pfn >= region->start_pfn && pfn < region->end_pfn) { | ||
| 964 | pr_err("PM: %#010llx in e820 nosave region: " | ||
| 965 | "[mem %#010llx-%#010llx]\n", | ||
| 966 | (unsigned long long) pfn << PAGE_SHIFT, | ||
| 967 | (unsigned long long) region->start_pfn << PAGE_SHIFT, | ||
| 968 | ((unsigned long long) region->end_pfn << PAGE_SHIFT) | ||
| 969 | - 1); | ||
| 970 | return true; | ||
| 971 | } | ||
| 972 | } | ||
| 973 | |||
| 974 | return false; | ||
| 975 | } | ||
| 976 | |||
| 977 | /** | 958 | /** |
| 978 | * create_basic_memory_bitmaps - create bitmaps needed for marking page | 959 | * create_basic_memory_bitmaps - create bitmaps needed for marking page |
| 979 | * frames that should not be saved and free page frames. The pointers | 960 | * frames that should not be saved and free page frames. The pointers |
| @@ -2042,7 +2023,7 @@ static int mark_unsafe_pages(struct memory_bitmap *bm) | |||
| 2042 | do { | 2023 | do { |
| 2043 | pfn = memory_bm_next_pfn(bm); | 2024 | pfn = memory_bm_next_pfn(bm); |
| 2044 | if (likely(pfn != BM_END_OF_MAP)) { | 2025 | if (likely(pfn != BM_END_OF_MAP)) { |
| 2045 | if (likely(pfn_valid(pfn)) && !is_nosave_page(pfn)) | 2026 | if (likely(pfn_valid(pfn))) |
| 2046 | swsusp_set_page_free(pfn_to_page(pfn)); | 2027 | swsusp_set_page_free(pfn_to_page(pfn)); |
| 2047 | else | 2028 | else |
| 2048 | return -EFAULT; | 2029 | return -EFAULT; |
