Commit 11199692 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds

mm: change signature of free_reserved_area() to fix building warnings

Change signature of free_reserved_area() according to Russell King's
suggestion to fix following build warnings:

  arch/arm/mm/init.c: In function 'mem_init':
  arch/arm/mm/init.c:603:2: warning: passing argument 1 of 'free_reserved_area' makes integer from pointer without a cast [enabled by default]
    free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);
    ^
  In file included from include/linux/mman.h:4:0,
                   from arch/arm/mm/init.c:15:
  include/linux/mm.h:1301:22: note: expected 'long unsigned int' but argument is of type 'void *'
   extern unsigned long free_reserved_area(unsigned long start, unsigned long end,

   mm/page_alloc.c: In function 'free_reserved_area':
>> mm/page_alloc.c:5134:3: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast [enabled by default]
   In file included from arch/mips/include/asm/page.h:49:0,
                    from include/linux/mmzone.h:20,
                    from include/linux/gfp.h:4,
                    from include/linux/mm.h:8,
                    from mm/page_alloc.c:18:
   arch/mips/include/asm/io.h:119:29: note: expected 'const volatile void *' but argument is of type 'long unsigned int'
   mm/page_alloc.c: In function 'free_area_init_nodes':
   mm/page_alloc.c:5030:34: warning: array subscript is below array bounds [-Warray-bounds]

Also address some minor code review comments.
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: <sworddragon2@aol.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Michel Lespinasse <walken@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dcf6b7dd
...@@ -238,8 +238,8 @@ nautilus_init_pci(void) ...@@ -238,8 +238,8 @@ nautilus_init_pci(void)
if (pci_mem < memtop) if (pci_mem < memtop)
memtop = pci_mem; memtop = pci_mem;
if (memtop > alpha_mv.min_mem_address) { if (memtop > alpha_mv.min_mem_address) {
free_reserved_area((unsigned long)__va(alpha_mv.min_mem_address), free_reserved_area(__va(alpha_mv.min_mem_address),
(unsigned long)__va(memtop), 0, NULL); __va(memtop), 0, NULL);
printk("nautilus_init_pci: %ldk freed\n", printk("nautilus_init_pci: %ldk freed\n",
(memtop - alpha_mv.min_mem_address) >> 10); (memtop - alpha_mv.min_mem_address) >> 10);
} }
......
...@@ -326,6 +326,6 @@ free_initmem(void) ...@@ -326,6 +326,6 @@ free_initmem(void)
void void
free_initrd_mem(unsigned long start, unsigned long end) free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
...@@ -152,7 +152,7 @@ void __init_refok free_initmem(void) ...@@ -152,7 +152,7 @@ void __init_refok free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -745,7 +745,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) ...@@ -745,7 +745,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (!keep_initrd) { if (!keep_initrd) {
poison_init_mem((void *)start, PAGE_ALIGN(end) - start); poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
} }
......
...@@ -398,7 +398,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) ...@@ -398,7 +398,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (!keep_initrd) { if (!keep_initrd) {
poison_init_mem((void *)start, PAGE_ALIGN(end) - start); poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
} }
......
...@@ -154,6 +154,6 @@ void free_initmem(void) ...@@ -154,6 +154,6 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
...@@ -133,7 +133,7 @@ void __init mem_init(void) ...@@ -133,7 +133,7 @@ void __init mem_init(void)
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
#ifndef CONFIG_MPU #ifndef CONFIG_MPU
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
#endif #endif
} }
#endif #endif
......
...@@ -78,7 +78,7 @@ void __init mem_init(void) ...@@ -78,7 +78,7 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -173,6 +173,6 @@ void free_initmem(void) ...@@ -173,6 +173,6 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} /* end free_initrd_mem() */ } /* end free_initrd_mem() */
#endif #endif
...@@ -161,7 +161,7 @@ void __init mem_init(void) ...@@ -161,7 +161,7 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -154,8 +154,7 @@ ia64_init_addr_space (void) ...@@ -154,8 +154,7 @@ ia64_init_addr_space (void)
void void
free_initmem (void) free_initmem (void)
{ {
free_reserved_area((unsigned long)ia64_imva(__init_begin), free_reserved_area(ia64_imva(__init_begin), ia64_imva(__init_end),
(unsigned long)ia64_imva(__init_end),
0, "unused kernel"); 0, "unused kernel");
} }
......
...@@ -191,6 +191,6 @@ void free_initmem(void) ...@@ -191,6 +191,6 @@ void free_initmem(void)
*======================================================================*/ *======================================================================*/
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
...@@ -202,6 +202,6 @@ void __init mem_init(void) ...@@ -202,6 +202,6 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
...@@ -414,7 +414,8 @@ void free_initmem(void) ...@@ -414,7 +414,8 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd"); free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
"initrd");
} }
#endif #endif
......
...@@ -235,7 +235,7 @@ void __init setup_memory(void) ...@@ -235,7 +235,7 @@ void __init setup_memory(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -440,7 +440,8 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end) ...@@ -440,7 +440,8 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd"); free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
"initrd");
} }
#endif #endif
......
...@@ -152,6 +152,7 @@ void free_initmem(void) ...@@ -152,6 +152,7 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd"); free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
"initrd");
} }
#endif #endif
...@@ -261,7 +261,7 @@ void __init mem_init(void) ...@@ -261,7 +261,7 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -1101,6 +1101,7 @@ void flush_tlb_all(void) ...@@ -1101,6 +1101,7 @@ void flush_tlb_all(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
num_physpages += free_reserved_area(start, end, 0, "initrd"); num_physpages += free_reserved_area((void *)start, (void *)end, 0,
"initrd");
} }
#endif #endif
...@@ -756,7 +756,7 @@ static __init void kvm_free_tmp(void) ...@@ -756,7 +756,7 @@ static __init void kvm_free_tmp(void)
end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK; end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK;
/* Free the tmp space we don't need */ /* Free the tmp space we don't need */
free_reserved_area(start, end, 0, NULL); free_reserved_area((void *)start, (void *)end, 0, NULL);
} }
static int __init kvm_guest_init(void) static int __init kvm_guest_init(void)
......
...@@ -407,7 +407,7 @@ void free_initmem(void) ...@@ -407,7 +407,7 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -172,7 +172,8 @@ void free_initmem(void) ...@@ -172,7 +172,8 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd"); free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
"initrd");
} }
#endif #endif
......
...@@ -108,7 +108,8 @@ void __init mem_init(void) ...@@ -108,7 +108,8 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd"); free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
"initrd");
} }
#endif #endif
......
...@@ -505,7 +505,7 @@ void free_initmem(void) ...@@ -505,7 +505,7 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -372,8 +372,8 @@ void free_initmem (void) ...@@ -372,8 +372,8 @@ void free_initmem (void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM, num_physpages += free_reserved_area((void *)start, (void *)end,
"initrd"); POISON_FREE_INITMEM, "initrd");
} }
#endif #endif
......
...@@ -2131,8 +2131,8 @@ void free_initmem(void) ...@@ -2131,8 +2131,8 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM, num_physpages += free_reserved_area((void *)start, (void *)end,
"initrd"); POISON_FREE_INITMEM, "initrd");
} }
#endif #endif
......
...@@ -244,7 +244,7 @@ void free_initmem(void) ...@@ -244,7 +244,7 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -486,7 +486,7 @@ static int keep_initrd; ...@@ -486,7 +486,7 @@ static int keep_initrd;
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (!keep_initrd) if (!keep_initrd)
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
static int __init keepinitrd_setup(char *__unused) static int __init keepinitrd_setup(char *__unused)
......
...@@ -214,7 +214,7 @@ extern int initrd_is_mapped; ...@@ -214,7 +214,7 @@ extern int initrd_is_mapped;
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (initrd_is_mapped) if (initrd_is_mapped)
free_reserved_area(start, end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, 0, "initrd");
} }
#endif #endif
......
...@@ -1311,7 +1311,7 @@ extern void free_initmem(void); ...@@ -1311,7 +1311,7 @@ extern void free_initmem(void);
* "poison" if it's non-zero. * "poison" if it's non-zero.
* Return pages freed into the buddy system. * Return pages freed into the buddy system.
*/ */
extern unsigned long free_reserved_area(unsigned long start, unsigned long end, extern unsigned long free_reserved_area(void *start, void *end,
int poison, char *s); int poison, char *s);
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
/* /*
...@@ -1355,8 +1355,7 @@ static inline unsigned long free_initmem_default(int poison) ...@@ -1355,8 +1355,7 @@ static inline unsigned long free_initmem_default(int poison)
{ {
extern char __init_begin[], __init_end[]; extern char __init_begin[], __init_end[];
return free_reserved_area(PAGE_ALIGN((unsigned long)&__init_begin) , return free_reserved_area(&__init_begin, &__init_end,
((unsigned long)&__init_end) & PAGE_MASK,
poison, "unused kernel"); poison, "unused kernel");
} }
......
...@@ -5206,25 +5206,26 @@ early_param("movablecore", cmdline_parse_movablecore); ...@@ -5206,25 +5206,26 @@ early_param("movablecore", cmdline_parse_movablecore);
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
unsigned long free_reserved_area(unsigned long start, unsigned long end, unsigned long free_reserved_area(void *start, void *end, int poison, char *s)
int poison, char *s)
{ {
unsigned long pages, pos; void *pos;
unsigned long pages = 0;
pos = start = PAGE_ALIGN(start); start = (void *)PAGE_ALIGN((unsigned long)start);
end &= PAGE_MASK; end = (void *)((unsigned long)end & PAGE_MASK);
for (pages = 0; pos < end; pos += PAGE_SIZE, pages++) { for (pos = start; pos < end; pos += PAGE_SIZE, pages++) {
if (poison) if (poison)
memset((void *)pos, poison, PAGE_SIZE); memset(pos, poison, PAGE_SIZE);
free_reserved_page(virt_to_page((void *)pos)); free_reserved_page(virt_to_page(pos));
} }
if (pages && s) if (pages && s)
pr_info("Freeing %s memory: %ldK (%lx - %lx)\n", pr_info("Freeing %s memory: %ldK (%p - %p)\n",
s, pages << (PAGE_SHIFT - 10), start, end); s, pages << (PAGE_SHIFT - 10), start, end);
return pages; return pages;
} }
EXPORT_SYMBOL(free_reserved_area);
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
void free_highmem_page(struct page *page) void free_highmem_page(struct page *page)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment