3 files changed, 0 insertions, 44 deletions

diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 27e7f2542b1c..99aa4db6e9c2 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -42,7 +42,6 @@ obj-$(CONFIG_SPARC32)   += windows.o
 obj-y                   += cpu.o
 obj-$(CONFIG_SPARC32)   += devices.o
 obj-$(CONFIG_SPARC32)   += tadpole.o
-obj-$(CONFIG_SPARC32)   += tick14.o
 obj-y                   += ptrace_$(BITS).o
 obj-y                   += unaligned_$(BITS).o
 obj-y                   += una_asm_$(BITS).o
diff --git a/arch/sparc/kernel/tick14.c b/arch/sparc/kernel/tick14.c
deleted file mode 100644
index 138bbf5f8724..000000000000
--- a/arch/sparc/kernel/tick14.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* tick14.c
- *
- * Copyright (C) 1996 David Redman (djhr@tadpole.co.uk)
- *
- * This file handles the Sparc specific level14 ticker
- * This is really useful for profiling OBP uses it for keyboard
- * aborts and other stuff.
- */
-#include <linux/kernel.h>
-
-extern unsigned long lvl14_save[5];
-static unsigned long *linux_lvl14 = NULL;
-static unsigned long obp_lvl14[4];
- 
-/*
- * Call with timer IRQ closed.
- * First time we do it with disable_irq, later prom code uses spin_lock_irq().
- */
-void install_linux_ticker(void)
-{
-
-        if (!linux_lvl14)
-                return;
-        linux_lvl14[0] =  lvl14_save[0];
-        linux_lvl14[1] =  lvl14_save[1];
-        linux_lvl14[2] =  lvl14_save[2];
-        linux_lvl14[3] =  lvl14_save[3];
-}
-
-void install_obp_ticker(void)
-{
-
-        if (!linux_lvl14)
-                return;
-        linux_lvl14[0] =  obp_lvl14[0];
-        linux_lvl14[1] =  obp_lvl14[1];
-        linux_lvl14[2] =  obp_lvl14[2];
-        linux_lvl14[3] =  obp_lvl14[3]; 
-}
diff --git a/arch/sparc/prom/misc_32.c b/arch/sparc/prom/misc_32.c
index 8c278c311ba4..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);
 }