Merge branch 'linus' into x86/urgent

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 3609bdee9ed2..3249d3f3234d 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -82,7 +82,7 @@ static void prom_sync_me(void)
                              "nop\n\t" : : "r" (&trapbase));
 
         prom_printf("PROM SYNC COMMAND...\n");
-        show_free_areas();
+        show_free_areas(0);
         if(current->pid != 0) {
                 local_irq_enable();
                 sys_sync();