x86: Remove register_nosave_region_late()
Subsystems (2)
PATCH 1/1 x86: Remove register_nosave_region_late()
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 <[email protected]>
Reviewed-by Cezary Rojewski <[email protected]>
--- include/linux/suspend.h | 11 +---------- kernel/power/snapshot.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 24 deletions(-)
include/linux/suspend.h +1 -10
@@ -430,15 +430,7 @@ struct platform_hibernation_ops {#ifdef CONFIG_HIBERNATION /* kernel/power/snapshot.c */ -extern void __register_nosave_region (unsigned long b,unsigned long e,int km); -static inline void __init register_nosave_region (unsigned long b,unsigned long e) -{ -__register_nosave_region (b, e,0 ); -} -static inline void __init register_nosave_region_late (unsigned long b,unsigned long e) -{ -__register_nosave_region (b, e,1 ); -} +extern void register_nosave_region (unsigned long b,unsigned long e);extern int swsusp_page_is_forbidden (struct page *);extern void swsusp_set_page_free (struct page *);extern void swsusp_unset_page_free (struct page *);
@@ -458,7 +450,6 @@ int pfn_is_nosave(unsigned long pfn);int hibernate_quiet_exec (int (*func)(void *data),void *data);#else /* CONFIG_HIBERNATION */ static inline void register_nosave_region (unsigned long b,unsigned long e) {} -static inline void register_nosave_region_late (unsigned long b,unsigned long e) {}static inline int swsusp_page_is_forbidden (struct page *p) {return 0 ; }static inline void swsusp_set_page_free (struct page *p) {}static inline void swsusp_unset_page_free (struct page *p) {}
kernel/power/snapshot.c +7 -14
@@ -978,8 +978,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;
@@ -995,18 +994,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);
Signature · 1 line
2.25.1
Quoted 71 lines · Amadeusz Sławiński
It is an unused wrapper forcing kmalloc allocation for registering nosave regions. Also, rename
__register_nosave_region()toregister_nosave_region()now that there is no need for disambiguation.Signed-off-by Amadeusz Sławiński <[email protected]>Reviewed-by Cezary Rojewski <[email protected]>--- include/linux/suspend.h | 11 +---------- kernel/power/snapshot.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 24 deletions(-)include/linux/suspend.h +1
-10@@ -430,15 +430,7 @@ struct platform_hibernation_ops {#ifdef CONFIG_HIBERNATION /* kernel/power/snapshot.c */ -extern void __register_nosave_region (unsigned long b,unsigned long e,int km); -static inline void __init register_nosave_region (unsigned long b,unsigned long e) -{ -__register_nosave_region (b, e,0 ); -} -static inline void __init register_nosave_region_late (unsigned long b,unsigned long e) -{ -__register_nosave_region (b, e,1 ); -} +extern void register_nosave_region (unsigned long b,unsigned long e);extern int swsusp_page_is_forbidden (struct page *);extern void swsusp_set_page_free (struct page *);extern void swsusp_unset_page_free (struct page *);@@ -458,7 +450,6 @@ int pfn_is_nosave(unsigned long pfn);int hibernate_quiet_exec (int (*func)(void *data),void *data);#else /* CONFIG_HIBERNATION */ static inline void register_nosave_region (unsigned long b,unsigned long e) {} -static inline void register_nosave_region_late (unsigned long b,unsigned long e) {}static inline int swsusp_page_is_forbidden (struct page *p) {return 0 ; }static inline void swsusp_set_page_free (struct page *p) {}static inline void swsusp_unset_page_free (struct page *p) {}kernel/power/snapshot.c +1
-14@@ -978,8 +978,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;@@ -995,18 +994,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 )); - }
kernel/power/snapshot.c void __init __register_nosave_region(unsigned long start_pfn,
Quoted 10 lines
kernel/power/snapshot.c +6
-1+/* 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); --
Applied as 5.18 material, thanks!