Skip to content

Commit e5cb113

Browse files
Alexey Dobriyantorvalds
authored andcommitted
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 <[email protected]> Reviewed-by: Andrew Morton <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 9a2f45f commit e5cb113

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

arch/x86/include/asm/processor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
967967
}
968968

969969
extern unsigned long arch_align_stack(unsigned long sp);
970-
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
970+
void free_init_pages(const char *what, unsigned long begin, unsigned long end);
971971
extern void free_kernel_image_pages(void *begin, void *end);
972972

973973
void default_idle(void);

arch/x86/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ int devmem_is_allowed(unsigned long pagenr)
742742
return 1;
743743
}
744744

745-
void free_init_pages(char *what, unsigned long begin, unsigned long end)
745+
void free_init_pages(const char *what, unsigned long begin, unsigned long end)
746746
{
747747
unsigned long begin_aligned, end_aligned;
748748

include/linux/mm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2108,7 +2108,7 @@ extern void free_initmem(void);
21082108
* Return pages freed into the buddy system.
21092109
*/
21102110
extern unsigned long free_reserved_area(void *start, void *end,
2111-
int poison, char *s);
2111+
int poison, const char *s);
21122112

21132113
#ifdef CONFIG_HIGHMEM
21142114
/*

mm/page_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7193,7 +7193,7 @@ void adjust_managed_page_count(struct page *page, long count)
71937193
}
71947194
EXPORT_SYMBOL(adjust_managed_page_count);
71957195

7196-
unsigned long free_reserved_area(void *start, void *end, int poison, char *s)
7196+
unsigned long free_reserved_area(void *start, void *end, int poison, const char *s)
71977197
{
71987198
void *pos;
71997199
unsigned long pages = 0;

0 commit comments

Comments
 (0)