diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/arm/mm/init.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 764d5dc9af76..877c492f8e10 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) { |