diff options
author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2009-09-21 20:02:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:34 -0400 |
commit | cc013a88906bad9d2832d6316de1c7dbc1c2a794 (patch) | |
tree | c47d1bc76cf9bbf94c328ca6e15ac99ddbab7603 /arch | |
parent | 73d7c33e81aed92ac185950a20407c1a2ea65a83 (diff) |
arches: drop superfluous casts in nr_free_pages() callers
Commit 96177299416dbccb73b54e6b344260154a445375 ("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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/mm/init.c | 2 | ||||
-rw-r--r-- | arch/alpha/mm/numa.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 4 | ||||
-rw-r--r-- | arch/avr32/mm/init.c | 2 | ||||
-rw-r--r-- | arch/cris/mm/init.c | 2 | ||||
-rw-r--r-- | arch/ia64/mm/init.c | 2 | ||||
-rw-r--r-- | arch/m32r/mm/init.c | 2 | ||||
-rw-r--r-- | arch/m68k/mm/init.c | 2 | ||||
-rw-r--r-- | arch/microblaze/mm/init.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/init.c | 2 | ||||
-rw-r--r-- | arch/mn10300/mm/init.c | 2 | ||||
-rw-r--r-- | arch/parisc/mm/init.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/mem.c | 2 | ||||
-rw-r--r-- | arch/s390/mm/init.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/init.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/init_32.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/mem.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/init_32.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/init_64.c | 2 | ||||
-rw-r--r-- | arch/xtensa/mm/init.c | 2 |
20 files changed, 21 insertions, 21 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index af71d38c8e41..a0902c20d677 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c | |||
@@ -299,7 +299,7 @@ printk_memory_info(void) | |||
299 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | 299 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; |
300 | 300 | ||
301 | printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, %luk data, %luk init)\n", | 301 | printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, %luk data, %luk init)\n", |
302 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 302 | nr_free_pages() << (PAGE_SHIFT-10), |
303 | max_mapnr << (PAGE_SHIFT-10), | 303 | max_mapnr << (PAGE_SHIFT-10), |
304 | codesize >> 10, | 304 | codesize >> 10, |
305 | reservedpages << (PAGE_SHIFT-10), | 305 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index 0eab55749423..10b403554b65 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c | |||
@@ -349,7 +349,7 @@ void __init mem_init(void) | |||
349 | 349 | ||
350 | printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, " | 350 | printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, " |
351 | "%luk data, %luk init)\n", | 351 | "%luk data, %luk init)\n", |
352 | (unsigned long)nr_free_pages() << (PAGE_SHIFT-10), | 352 | nr_free_pages() << (PAGE_SHIFT-10), |
353 | num_physpages << (PAGE_SHIFT-10), | 353 | num_physpages << (PAGE_SHIFT-10), |
354 | codesize >> 10, | 354 | codesize >> 10, |
355 | reservedpages << (PAGE_SHIFT-10), | 355 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index ea36186f32c3..f982606d7bf9 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -596,8 +596,8 @@ void __init mem_init(void) | |||
596 | 596 | ||
597 | printk(KERN_NOTICE "Memory: %luKB available (%dK code, " | 597 | printk(KERN_NOTICE "Memory: %luKB available (%dK code, " |
598 | "%dK data, %dK init, %luK highmem)\n", | 598 | "%dK data, %dK init, %luK highmem)\n", |
599 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 599 | nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10, |
600 | codesize >> 10, datasize >> 10, initsize >> 10, | 600 | datasize >> 10, initsize >> 10, |
601 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); | 601 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); |
602 | 602 | ||
603 | if (PAGE_SIZE >= 16384 && num_physpages <= 128) { | 603 | if (PAGE_SIZE >= 16384 && num_physpages <= 128) { |
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c index e819fa69a90e..376f18c4a6cb 100644 --- a/arch/avr32/mm/init.c +++ b/arch/avr32/mm/init.c | |||
@@ -141,7 +141,7 @@ void __init mem_init(void) | |||
141 | 141 | ||
142 | printk ("Memory: %luk/%luk available (%dk kernel code, " | 142 | printk ("Memory: %luk/%luk available (%dk kernel code, " |
143 | "%dk reserved, %dk data, %dk init)\n", | 143 | "%dk reserved, %dk data, %dk init)\n", |
144 | (unsigned long)nr_free_pages() << (PAGE_SHIFT - 10), | 144 | nr_free_pages() << (PAGE_SHIFT - 10), |
145 | totalram_pages << (PAGE_SHIFT - 10), | 145 | totalram_pages << (PAGE_SHIFT - 10), |
146 | codesize >> 10, | 146 | codesize >> 10, |
147 | reservedpages << (PAGE_SHIFT - 10), | 147 | reservedpages << (PAGE_SHIFT - 10), |
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index 514f46a4b230..ff68b9f516a1 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c | |||
@@ -54,7 +54,7 @@ mem_init(void) | |||
54 | printk(KERN_INFO | 54 | printk(KERN_INFO |
55 | "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, " | 55 | "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, " |
56 | "%dk init)\n" , | 56 | "%dk init)\n" , |
57 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 57 | nr_free_pages() << (PAGE_SHIFT-10), |
58 | max_mapnr << (PAGE_SHIFT-10), | 58 | max_mapnr << (PAGE_SHIFT-10), |
59 | codesize >> 10, | 59 | codesize >> 10, |
60 | reservedpages << (PAGE_SHIFT-10), | 60 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index b115b3bbf04a..1d286244a562 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -655,7 +655,7 @@ mem_init (void) | |||
655 | initsize = (unsigned long) __init_end - (unsigned long) __init_begin; | 655 | initsize = (unsigned long) __init_end - (unsigned long) __init_begin; |
656 | 656 | ||
657 | printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, " | 657 | printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, " |
658 | "%luk data, %luk init)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10), | 658 | "%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10), |
659 | num_physpages << (PAGE_SHIFT - 10), codesize >> 10, | 659 | num_physpages << (PAGE_SHIFT - 10), codesize >> 10, |
660 | reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10); | 660 | reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10); |
661 | 661 | ||
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 24d429f9358a..9f581df3952b 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
@@ -171,7 +171,7 @@ void __init mem_init(void) | |||
171 | 171 | ||
172 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " | 172 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " |
173 | "%dk reserved, %dk data, %dk init)\n", | 173 | "%dk reserved, %dk data, %dk init)\n", |
174 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 174 | nr_free_pages() << (PAGE_SHIFT-10), |
175 | num_physpages << (PAGE_SHIFT-10), | 175 | num_physpages << (PAGE_SHIFT-10), |
176 | codesize >> 10, | 176 | codesize >> 10, |
177 | reservedpages << (PAGE_SHIFT-10), | 177 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 0007b2adf3a3..774549accd2d 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c | |||
@@ -126,7 +126,7 @@ void __init mem_init(void) | |||
126 | #endif | 126 | #endif |
127 | 127 | ||
128 | printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n", | 128 | printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n", |
129 | (unsigned long)nr_free_pages() << (PAGE_SHIFT-10), | 129 | nr_free_pages() << (PAGE_SHIFT-10), |
130 | totalram_pages << (PAGE_SHIFT-10), | 130 | totalram_pages << (PAGE_SHIFT-10), |
131 | codepages << (PAGE_SHIFT-10), | 131 | codepages << (PAGE_SHIFT-10), |
132 | datapages << (PAGE_SHIFT-10), | 132 | datapages << (PAGE_SHIFT-10), |
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index f207f1a94dbc..1110784eb3f7 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
@@ -204,7 +204,7 @@ void __init mem_init(void) | |||
204 | totalram_pages += free_all_bootmem(); | 204 | totalram_pages += free_all_bootmem(); |
205 | 205 | ||
206 | printk(KERN_INFO "Memory: %luk/%luk available\n", | 206 | printk(KERN_INFO "Memory: %luk/%luk available\n", |
207 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 207 | nr_free_pages() << (PAGE_SHIFT-10), |
208 | num_physpages << (PAGE_SHIFT-10)); | 208 | num_physpages << (PAGE_SHIFT-10)); |
209 | #ifdef CONFIG_MMU | 209 | #ifdef CONFIG_MMU |
210 | mem_init_done = 1; | 210 | mem_init_done = 1; |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 38c79c55b060..1f4ee4797a6e 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -417,7 +417,7 @@ void __init mem_init(void) | |||
417 | 417 | ||
418 | printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " | 418 | printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " |
419 | "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n", | 419 | "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n", |
420 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 420 | nr_free_pages() << (PAGE_SHIFT-10), |
421 | ram << (PAGE_SHIFT-10), | 421 | ram << (PAGE_SHIFT-10), |
422 | codesize >> 10, | 422 | codesize >> 10, |
423 | reservedpages << (PAGE_SHIFT-10), | 423 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c index 8cee387a24fd..ec1420562dc7 100644 --- a/arch/mn10300/mm/init.c +++ b/arch/mn10300/mm/init.c | |||
@@ -112,7 +112,7 @@ void __init mem_init(void) | |||
112 | "Memory: %luk/%luk available" | 112 | "Memory: %luk/%luk available" |
113 | " (%dk kernel code, %dk reserved, %dk data, %dk init," | 113 | " (%dk kernel code, %dk reserved, %dk data, %dk init," |
114 | " %ldk highmem)\n", | 114 | " %ldk highmem)\n", |
115 | (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10), | 115 | nr_free_pages() << (PAGE_SHIFT - 10), |
116 | max_mapnr << (PAGE_SHIFT - 10), | 116 | max_mapnr << (PAGE_SHIFT - 10), |
117 | codesize >> 10, | 117 | codesize >> 10, |
118 | reservedpages << (PAGE_SHIFT - 10), | 118 | reservedpages << (PAGE_SHIFT - 10), |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index b0831d9e35cb..d5aca31fddbb 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -506,7 +506,7 @@ void __init mem_init(void) | |||
506 | #endif | 506 | #endif |
507 | 507 | ||
508 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n", | 508 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n", |
509 | (unsigned long)nr_free_pages() << (PAGE_SHIFT-10), | 509 | nr_free_pages() << (PAGE_SHIFT-10), |
510 | num_physpages << (PAGE_SHIFT-10), | 510 | num_physpages << (PAGE_SHIFT-10), |
511 | codesize >> 10, | 511 | codesize >> 10, |
512 | reservedpages << (PAGE_SHIFT-10), | 512 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 579382c163a9..0e5c59b995ef 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -372,7 +372,7 @@ void __init mem_init(void) | |||
372 | 372 | ||
373 | printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " | 373 | printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " |
374 | "%luk reserved, %luk data, %luk bss, %luk init)\n", | 374 | "%luk reserved, %luk data, %luk bss, %luk init)\n", |
375 | (unsigned long)nr_free_pages() << (PAGE_SHIFT-10), | 375 | nr_free_pages() << (PAGE_SHIFT-10), |
376 | num_physpages << (PAGE_SHIFT-10), | 376 | num_physpages << (PAGE_SHIFT-10), |
377 | codesize >> 10, | 377 | codesize >> 10, |
378 | reservedpages << (PAGE_SHIFT-10), | 378 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index c634dfbe92e9..765647952221 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
@@ -105,7 +105,7 @@ void __init mem_init(void) | |||
105 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; | 105 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; |
106 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | 106 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; |
107 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n", | 107 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n", |
108 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 108 | nr_free_pages() << (PAGE_SHIFT-10), |
109 | max_mapnr << (PAGE_SHIFT-10), | 109 | max_mapnr << (PAGE_SHIFT-10), |
110 | codesize >> 10, | 110 | codesize >> 10, |
111 | reservedpages << (PAGE_SHIFT-10), | 111 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index edc842ff61ed..fabb7c6f48d2 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
@@ -232,7 +232,7 @@ void __init mem_init(void) | |||
232 | 232 | ||
233 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " | 233 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " |
234 | "%dk data, %dk init)\n", | 234 | "%dk data, %dk init)\n", |
235 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 235 | nr_free_pages() << (PAGE_SHIFT-10), |
236 | num_physpages << (PAGE_SHIFT-10), | 236 | num_physpages << (PAGE_SHIFT-10), |
237 | codesize >> 10, | 237 | codesize >> 10, |
238 | datasize >> 10, | 238 | datasize >> 10, |
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 54114ad0bdee..dc7c3b17a15f 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c | |||
@@ -472,7 +472,7 @@ void __init mem_init(void) | |||
472 | reservedpages++; | 472 | reservedpages++; |
473 | 473 | ||
474 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n", | 474 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n", |
475 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 475 | nr_free_pages() << (PAGE_SHIFT-10), |
476 | num_physpages << (PAGE_SHIFT - 10), | 476 | num_physpages << (PAGE_SHIFT - 10), |
477 | codepages << (PAGE_SHIFT-10), | 477 | codepages << (PAGE_SHIFT-10), |
478 | reservedpages << (PAGE_SHIFT - 10), | 478 | reservedpages << (PAGE_SHIFT - 10), |
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 61d7e6138ff5..a5d5e70cf6f5 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -77,7 +77,7 @@ void __init mem_init(void) | |||
77 | num_physpages = totalram_pages; | 77 | num_physpages = totalram_pages; |
78 | max_pfn = totalram_pages; | 78 | max_pfn = totalram_pages; |
79 | printk(KERN_INFO "Memory: %luk available\n", | 79 | printk(KERN_INFO "Memory: %luk available\n", |
80 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10)); | 80 | nr_free_pages() << (PAGE_SHIFT-10)); |
81 | kmalloc_ok = 1; | 81 | kmalloc_ok = 1; |
82 | 82 | ||
83 | #ifdef CONFIG_HIGHMEM | 83 | #ifdef CONFIG_HIGHMEM |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 3cd7711bb949..95e877f5b846 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -892,7 +892,7 @@ void __init mem_init(void) | |||
892 | 892 | ||
893 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " | 893 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " |
894 | "%dk reserved, %dk data, %dk init, %ldk highmem)\n", | 894 | "%dk reserved, %dk data, %dk init, %ldk highmem)\n", |
895 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 895 | nr_free_pages() << (PAGE_SHIFT-10), |
896 | num_physpages << (PAGE_SHIFT-10), | 896 | num_physpages << (PAGE_SHIFT-10), |
897 | codesize >> 10, | 897 | codesize >> 10, |
898 | reservedpages << (PAGE_SHIFT-10), | 898 | reservedpages << (PAGE_SHIFT-10), |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index ea56b8cbb6a6..810bd31e7f5f 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -687,7 +687,7 @@ void __init mem_init(void) | |||
687 | 687 | ||
688 | printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " | 688 | printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " |
689 | "%ldk absent, %ldk reserved, %ldk data, %ldk init)\n", | 689 | "%ldk absent, %ldk reserved, %ldk data, %ldk init)\n", |
690 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 690 | nr_free_pages() << (PAGE_SHIFT-10), |
691 | max_pfn << (PAGE_SHIFT-10), | 691 | max_pfn << (PAGE_SHIFT-10), |
692 | codesize >> 10, | 692 | codesize >> 10, |
693 | absent_pages << (PAGE_SHIFT-10), | 693 | absent_pages << (PAGE_SHIFT-10), |
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index 427e14fa43c5..cdbc27ca9665 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c | |||
@@ -203,7 +203,7 @@ void __init mem_init(void) | |||
203 | 203 | ||
204 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " | 204 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " |
205 | "%ldk data, %ldk init %ldk highmem)\n", | 205 | "%ldk data, %ldk init %ldk highmem)\n", |
206 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 206 | nr_free_pages() << (PAGE_SHIFT-10), |
207 | ram << (PAGE_SHIFT-10), | 207 | ram << (PAGE_SHIFT-10), |
208 | codesize >> 10, | 208 | codesize >> 10, |
209 | reservedpages << (PAGE_SHIFT-10), | 209 | reservedpages << (PAGE_SHIFT-10), |