mm: make free_reserved_area() return "const char *"

and propagate through down the call stack.

Link: http://lkml.kernel.org/r/20181124091411.GC10969@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 071b2a6fff85c9a85c3cc5f4f349fb836224254f..33051436c86459131a23005b67ecfdaa952cc123 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -967,7 +967,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
 }
 
 extern unsigned long arch_align_stack(unsigned long sp);
-extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
+void free_init_pages(const char *what, unsigned long begin, unsigned long end);
 extern void free_kernel_image_pages(void *begin, void *end);
 
 void default_idle(void);

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index ef99f3892e1faedbf96a935838c248c4801dbc2b..b0bcc8f4a525432e8192d924f710837010d5997c 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -742,7 +742,7 @@ int devmem_is_allowed(unsigned long pagenr)
        return 1;
 }
 
-void free_init_pages(char *what, unsigned long begin, unsigned long end)
+void free_init_pages(const char *what, unsigned long begin, unsigned long end)
 {
        unsigned long begin_aligned, end_aligned;
 

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 63d1c905ef7434d70964e86be9939e51c8a640e8..cb208c7b731e133233e8cdfbb5dcabbb037f0e0f 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2107,7 +2107,7 @@ extern void free_initmem(void);
  * Return pages freed into the buddy system.
  */
 extern unsigned long free_reserved_area(void *start, void *end,
-                                       int poison, char *s);
+                                       int poison, const char *s);
 
 #ifdef CONFIG_HIGHMEM
 /*

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index dbd34ea4a8a12b812ebad352ce60f46367521e56..4f2ffa9fe047ca36a5f8e2b032b19336683873a6 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7250,7 +7250,7 @@ void adjust_managed_page_count(struct page *page, long count)
 }
 EXPORT_SYMBOL(adjust_managed_page_count);
 
-unsigned long free_reserved_area(void *start, void *end, int poison, char *s)
+unsigned long free_reserved_area(void *start, void *end, int poison, const char *s)
 {
        void *pos;
        unsigned long pages = 0;