Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/sparc/prom/misc_32.c b/arch/sparc/prom/misc_32.c
index 4d61c540bb3d..677b6a10fbde 100644
--- a/arch/sparc/prom/misc_32.c
+++ b/arch/sparc/prom/misc_32.c
@@ -54,15 +54,11 @@ EXPORT_SYMBOL(prom_feval);
 void
 prom_cmdline(void)
 {
-        extern void install_obp_ticker(void);
-        extern void install_linux_ticker(void);
         unsigned long flags;
 
         spin_lock_irqsave(&prom_lock, flags);
-        install_obp_ticker();
         (*(romvec->pv_abort))();
         restore_current();
-        install_linux_ticker();
         spin_unlock_irqrestore(&prom_lock, flags);
         set_auxio(AUXIO_LED, 0);
 }
@@ -70,7 +66,7 @@ prom_cmdline(void)
 /* Drop into the prom, but completely terminate the program.
  * No chance of continuing.
  */
-void
+void __noreturn
 prom_halt(void)
 {
         unsigned long flags;