Skip to content

Commit

Permalink
arches: drop superfluous casts in nr_free_pages() callers
Browse files Browse the repository at this point in the history 
Commit 9617729 ("Drop free_pages()")
modified nr_free_pages() to return 'unsigned long' instead of 'unsigned
int'.  This made the casts to 'unsigned long' in most callers superfluous,
so remove them.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Chris Zankel <zankel@tensilica.com>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Sep 22, 2009
1 parent 73d7c33 commit cc013a8
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion arch/alpha/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ printk_memory_info(void)
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;

printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, %luk data, %luk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/mm/numa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void __init mem_init(void)

printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, "
"%luk data, %luk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,8 @@ void __init mem_init(void)

printk(KERN_NOTICE "Memory: %luKB available (%dK code, "
"%dK data, %dK init, %luK highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
codesize >> 10, datasize >> 10, initsize >> 10,
nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,
datasize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));

if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
Expand Down
2 changes: 1 addition & 1 deletion arch/avr32/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void __init mem_init(void)

printk ("Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT - 10),
nr_free_pages() << (PAGE_SHIFT - 10),
totalram_pages << (PAGE_SHIFT - 10),
codesize >> 10,
reservedpages << (PAGE_SHIFT - 10),
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mem_init(void)
printk(KERN_INFO
"Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, "
"%dk init)\n" ,
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ mem_init (void)
initsize = (unsigned long) __init_end - (unsigned long) __init_begin;

printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
"%luk data, %luk init)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
"%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);

Expand Down
2 changes: 1 addition & 1 deletion arch/m32r/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void __init mem_init(void)
#endif

printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
totalram_pages << (PAGE_SHIFT-10),
codepages << (PAGE_SHIFT-10),
datapages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void __init mem_init(void)
totalram_pages += free_all_bootmem();

printk(KERN_INFO "Memory: %luk/%luk available\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10));
#ifdef CONFIG_MMU
mem_init_done = 1;
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
"%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
ram << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/mn10300/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void __init mem_init(void)
"Memory: %luk/%luk available"
" (%dk kernel code, %dk reserved, %dk data, %dk init,"
" %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
nr_free_pages() << (PAGE_SHIFT - 10),
max_mapnr << (PAGE_SHIFT - 10),
codesize >> 10,
reservedpages << (PAGE_SHIFT - 10),
Expand Down
2 changes: 1 addition & 1 deletion arch/parisc/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ void __init mem_init(void)
#endif

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/mm/mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, "
"%luk reserved, %luk data, %luk bss, %luk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void __init mem_init(void)
datasize = (unsigned long) &_edata - (unsigned long) &_etext;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk data, %dk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
datasize >> 10,
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/mm/init_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ void __init mem_init(void)
reservedpages++;

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT - 10),
codepages << (PAGE_SHIFT-10),
reservedpages << (PAGE_SHIFT - 10),
Expand Down
2 changes: 1 addition & 1 deletion arch/um/kernel/mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void __init mem_init(void)
num_physpages = totalram_pages;
max_pfn = totalram_pages;
printk(KERN_INFO "Memory: %luk available\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10));
nr_free_pages() << (PAGE_SHIFT-10));
kmalloc_ok = 1;

#ifdef CONFIG_HIGHMEM
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mm/init_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init, %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mm/init_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
"%ldk absent, %ldk reserved, %ldk data, %ldk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_pfn << (PAGE_SHIFT-10),
codesize >> 10,
absent_pages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void __init mem_init(void)

printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
"%ldk data, %ldk init %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
ram << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down

0 comments on commit cc013a8

Please sign in to comment.