diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-25 17:30:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-25 17:30:53 +0100 |
| commit | 0b9e31e9264f1bad89856afb96da1688292f13b4 (patch) | |
| tree | 7a9e9b6456dce993efeed8734de0a15a1f16ae94 /arch/alpha/mm/init.c | |
| parent | cf82ff7ea7695b0e82ba07bc5e9f1bd03a74e1aa (diff) | |
| parent | 964fe080d94db82a3268443e9b9ece4c60246414 (diff) | |
Merge branch 'linus' into sched/core
Conflicts:
fs/proc/array.c
Merge reason: resolve conflict and queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/mm/init.c')
| -rw-r--r-- | arch/alpha/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index af71d38c8e4..a0902c20d67 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -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), |