diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
| commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
| tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /arch/s390/mm/init.c | |
| parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
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), |