Skip to content

Commit 1119969

Browse files
jiangliutorvalds
authored andcommitted
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: Jiang Liu <[email protected]> Reported-by: Arnd Bergmann <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: "Michael S. Tsirkin" <[email protected]> Cc: <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Chris Metcalf <[email protected]> Cc: David Howells <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Jianguo Wu <[email protected]> Cc: Joonsoo Kim <[email protected]> Cc: Kamezawa Hiroyuki <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Cc: Marek Szyprowski <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Michel Lespinasse <[email protected]> Cc: Minchan Kim <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Tang Chen <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Wen Congyang <[email protected]> Cc: Will Deacon <[email protected]> Cc: Yasuaki Ishimatsu <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent dcf6b7d commit 1119969

File tree

31 files changed

+50
-45
lines changed

31 files changed

+50
-45
lines changed

arch/alpha/kernel/sys_nautilus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ nautilus_init_pci(void)
238238
if (pci_mem < memtop)
239239
memtop = pci_mem;
240240
if (memtop > alpha_mv.min_mem_address) {
241-
free_reserved_area((unsigned long)__va(alpha_mv.min_mem_address),
242-
(unsigned long)__va(memtop), 0, NULL);
241+
free_reserved_area(__va(alpha_mv.min_mem_address),
242+
__va(memtop), 0, NULL);
243243
printk("nautilus_init_pci: %ldk freed\n",
244244
(memtop - alpha_mv.min_mem_address) >> 10);
245245
}

arch/alpha/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,6 @@ free_initmem(void)
326326
void
327327
free_initrd_mem(unsigned long start, unsigned long end)
328328
{
329-
free_reserved_area(start, end, 0, "initrd");
329+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
330330
}
331331
#endif

arch/arc/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void __init_refok free_initmem(void)
152152
#ifdef CONFIG_BLK_DEV_INITRD
153153
void __init free_initrd_mem(unsigned long start, unsigned long end)
154154
{
155-
free_reserved_area(start, end, 0, "initrd");
155+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
156156
}
157157
#endif
158158

arch/arm/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
745745
{
746746
if (!keep_initrd) {
747747
poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
748-
free_reserved_area(start, end, 0, "initrd");
748+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
749749
}
750750
}
751751

arch/arm64/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
398398
{
399399
if (!keep_initrd) {
400400
poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
401-
free_reserved_area(start, end, 0, "initrd");
401+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
402402
}
403403
}
404404

arch/avr32/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,6 @@ void free_initmem(void)
154154
#ifdef CONFIG_BLK_DEV_INITRD
155155
void free_initrd_mem(unsigned long start, unsigned long end)
156156
{
157-
free_reserved_area(start, end, 0, "initrd");
157+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
158158
}
159159
#endif

arch/blackfin/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void __init mem_init(void)
133133
void __init free_initrd_mem(unsigned long start, unsigned long end)
134134
{
135135
#ifndef CONFIG_MPU
136-
free_reserved_area(start, end, 0, "initrd");
136+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
137137
#endif
138138
}
139139
#endif

arch/c6x/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void __init mem_init(void)
7878
#ifdef CONFIG_BLK_DEV_INITRD
7979
void __init free_initrd_mem(unsigned long start, unsigned long end)
8080
{
81-
free_reserved_area(start, end, 0, "initrd");
81+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
8282
}
8383
#endif
8484

arch/frv/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,6 @@ void free_initmem(void)
173173
#ifdef CONFIG_BLK_DEV_INITRD
174174
void __init free_initrd_mem(unsigned long start, unsigned long end)
175175
{
176-
free_reserved_area(start, end, 0, "initrd");
176+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
177177
} /* end free_initrd_mem() */
178178
#endif

arch/h8300/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void __init mem_init(void)
161161
#ifdef CONFIG_BLK_DEV_INITRD
162162
void free_initrd_mem(unsigned long start, unsigned long end)
163163
{
164-
free_reserved_area(start, end, 0, "initrd");
164+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
165165
}
166166
#endif
167167

0 commit comments

Comments
 (0)