PM: hibernate: Remove register_nosave_region_late()
[ Upstream commit 33569ef3c754a82010f266b7b938a66a3ccf90a4 ] It is an unused wrapper forcing kmalloc allocation for registering nosave regions. Also, rename __register_nosave_region() to register_nosave_region() now that there is no need for disambiguation. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
此提交包含在:
@@ -944,8 +944,7 @@ static void memory_bm_recycle(struct memory_bitmap *bm)
|
||||
* Register a range of page frames the contents of which should not be saved
|
||||
* during hibernation (to be used in the early initialization code).
|
||||
*/
|
||||
void __init __register_nosave_region(unsigned long start_pfn,
|
||||
unsigned long end_pfn, int use_kmalloc)
|
||||
void __init register_nosave_region(unsigned long start_pfn, unsigned long end_pfn)
|
||||
{
|
||||
struct nosave_region *region;
|
||||
|
||||
@@ -961,18 +960,12 @@ void __init __register_nosave_region(unsigned long start_pfn,
|
||||
goto Report;
|
||||
}
|
||||
}
|
||||
if (use_kmalloc) {
|
||||
/* During init, this shouldn't fail */
|
||||
region = kmalloc(sizeof(struct nosave_region), GFP_KERNEL);
|
||||
BUG_ON(!region);
|
||||
} else {
|
||||
/* This allocation cannot fail */
|
||||
region = memblock_alloc(sizeof(struct nosave_region),
|
||||
SMP_CACHE_BYTES);
|
||||
if (!region)
|
||||
panic("%s: Failed to allocate %zu bytes\n", __func__,
|
||||
sizeof(struct nosave_region));
|
||||
}
|
||||
/* This allocation cannot fail */
|
||||
region = memblock_alloc(sizeof(struct nosave_region),
|
||||
SMP_CACHE_BYTES);
|
||||
if (!region)
|
||||
panic("%s: Failed to allocate %zu bytes\n", __func__,
|
||||
sizeof(struct nosave_region));
|
||||
region->start_pfn = start_pfn;
|
||||
region->end_pfn = end_pfn;
|
||||
list_add_tail(®ion->list, &nosave_regions);
|
||||
|
新增問題並參考
封鎖使用者