diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2011-01-28 17:08:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 21:19:08 -0400 |
commit | e046b1e978f82e29da7670d6d680567e30dec69a (patch) | |
tree | 85cc35c87a5a65dd35a19395bf0fb825cf6740f2 | |
parent | 2666e476022c678b3758e753b20c22ca598dc73f (diff) |
sparc32: remove tick14.c
The two methods included in tick14.c was nop because
the static variable linux_lvl14 was always NULL.
So remove the file and callers.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/tick14.c | 39 | ||||
-rw-r--r-- | arch/sparc/prom/misc_32.c | 4 |
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 | |||
42 | obj-y += cpu.o | 42 | obj-y += cpu.o |
43 | obj-$(CONFIG_SPARC32) += devices.o | 43 | obj-$(CONFIG_SPARC32) += devices.o |
44 | obj-$(CONFIG_SPARC32) += tadpole.o | 44 | obj-$(CONFIG_SPARC32) += tadpole.o |
45 | obj-$(CONFIG_SPARC32) += tick14.o | ||
46 | obj-y += ptrace_$(BITS).o | 45 | obj-y += ptrace_$(BITS).o |
47 | obj-y += unaligned_$(BITS).o | 46 | obj-y += unaligned_$(BITS).o |
48 | obj-y += una_asm_$(BITS).o | 47 | 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 @@ | |||
1 | /* tick14.c | ||
2 | * | ||
3 | * Copyright (C) 1996 David Redman (djhr@tadpole.co.uk) | ||
4 | * | ||
5 | * This file handles the Sparc specific level14 ticker | ||
6 | * This is really useful for profiling OBP uses it for keyboard | ||
7 | * aborts and other stuff. | ||
8 | */ | ||
9 | #include <linux/kernel.h> | ||
10 | |||
11 | extern unsigned long lvl14_save[5]; | ||
12 | static unsigned long *linux_lvl14 = NULL; | ||
13 | static unsigned long obp_lvl14[4]; | ||
14 | |||
15 | /* | ||
16 | * Call with timer IRQ closed. | ||
17 | * First time we do it with disable_irq, later prom code uses spin_lock_irq(). | ||
18 | */ | ||
19 | void install_linux_ticker(void) | ||
20 | { | ||
21 | |||
22 | if (!linux_lvl14) | ||
23 | return; | ||
24 | linux_lvl14[0] = lvl14_save[0]; | ||
25 | linux_lvl14[1] = lvl14_save[1]; | ||
26 | linux_lvl14[2] = lvl14_save[2]; | ||
27 | linux_lvl14[3] = lvl14_save[3]; | ||
28 | } | ||
29 | |||
30 | void install_obp_ticker(void) | ||
31 | { | ||
32 | |||
33 | if (!linux_lvl14) | ||
34 | return; | ||
35 | linux_lvl14[0] = obp_lvl14[0]; | ||
36 | linux_lvl14[1] = obp_lvl14[1]; | ||
37 | linux_lvl14[2] = obp_lvl14[2]; | ||
38 | linux_lvl14[3] = obp_lvl14[3]; | ||
39 | } | ||
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); | |||
54 | void | 54 | void |
55 | prom_cmdline(void) | 55 | prom_cmdline(void) |
56 | { | 56 | { |
57 | extern void install_obp_ticker(void); | ||
58 | extern void install_linux_ticker(void); | ||
59 | unsigned long flags; | 57 | unsigned long flags; |
60 | 58 | ||
61 | spin_lock_irqsave(&prom_lock, flags); | 59 | spin_lock_irqsave(&prom_lock, flags); |
62 | install_obp_ticker(); | ||
63 | (*(romvec->pv_abort))(); | 60 | (*(romvec->pv_abort))(); |
64 | restore_current(); | 61 | restore_current(); |
65 | install_linux_ticker(); | ||
66 | spin_unlock_irqrestore(&prom_lock, flags); | 62 | spin_unlock_irqrestore(&prom_lock, flags); |
67 | set_auxio(AUXIO_LED, 0); | 63 | set_auxio(AUXIO_LED, 0); |
68 | } | 64 | } |