diff options
Diffstat (limited to 'arch/powerpc/platforms/iseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index b08c3686f903..190891ce9cb4 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -89,8 +89,6 @@ extern unsigned long embedded_sysmap_end; | |||
89 | extern unsigned long iSeries_recal_tb; | 89 | extern unsigned long iSeries_recal_tb; |
90 | extern unsigned long iSeries_recal_titan; | 90 | extern unsigned long iSeries_recal_titan; |
91 | 91 | ||
92 | static int mf_initialized; | ||
93 | |||
94 | static unsigned long cmd_mem_limit; | 92 | static unsigned long cmd_mem_limit; |
95 | 93 | ||
96 | struct MemoryBlock { | 94 | struct MemoryBlock { |
@@ -347,8 +345,6 @@ static void __init iSeries_init_early(void) | |||
347 | HvCallEvent_setLpEventQueueInterruptProc(0, 0); | 345 | HvCallEvent_setLpEventQueueInterruptProc(0, 0); |
348 | 346 | ||
349 | mf_init(); | 347 | mf_init(); |
350 | mf_initialized = 1; | ||
351 | mb(); | ||
352 | 348 | ||
353 | /* If we were passed an initrd, set the ROOT_DEV properly if the values | 349 | /* If we were passed an initrd, set the ROOT_DEV properly if the values |
354 | * look sensible. If not, clear initrd reference. | 350 | * look sensible. If not, clear initrd reference. |
@@ -585,12 +581,7 @@ static void iSeries_halt(void) | |||
585 | static void __init iSeries_progress(char * st, unsigned short code) | 581 | static void __init iSeries_progress(char * st, unsigned short code) |
586 | { | 582 | { |
587 | printk("Progress: [%04x] - %s\n", (unsigned)code, st); | 583 | printk("Progress: [%04x] - %s\n", (unsigned)code, st); |
588 | if (!piranha_simulator && mf_initialized) { | 584 | mf_display_progress(code); |
589 | if (code != 0xffff) | ||
590 | mf_display_progress(code); | ||
591 | else | ||
592 | mf_clear_src(); | ||
593 | } | ||
594 | } | 585 | } |
595 | 586 | ||
596 | static void __init iSeries_fixup_klimit(void) | 587 | static void __init iSeries_fixup_klimit(void) |