summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2018-12-28 00:36:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 12:11:48 -0800
commite5cb113f2dbc8125f31005faebab161a2a84ebe6 (patch)
tree66317fd8b28dcbe4cdaac624edec6d3ae6a9aab5
parent9a2f45ff320287d49a3cd90ce68cb58a6da6f5e1 (diff)
downloadlinux-stable-e5cb113f2dbc8125f31005faebab161a2a84ebe6.tar.gz
linux-stable-e5cb113f2dbc8125f31005faebab161a2a84ebe6.tar.bz2
linux-stable-e5cb113f2dbc8125f31005faebab161a2a84ebe6.zip
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: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/include/asm/processor.h2
-rw-r--r--arch/x86/mm/init.c2
-rw-r--r--include/linux/mm.h2
-rw-r--r--mm/page_alloc.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 071b2a6fff85..33051436c864 100644
--- 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 427a955a2cf2..f905a2371080 100644
--- 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 031b2ce983f9..9963f77f1101 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2108,7 +2108,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 4115d7f20223..e97ebaf5ba26 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7193,7 +7193,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;