diff options
| author | Philippe Gerum <rpm@xenomai.org> | 2009-06-15 23:25:50 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-22 21:15:56 -0400 |
| commit | 5ba3b249c9e08100b0822f17276348b3447d6ee3 (patch) | |
| tree | f973059af0c05c5644d63a937f8aee89892b1fd8 | |
| parent | a40494a62a11dbaf326397aa94b2018ead09884d (diff) | |
Blackfin: remove obsolete mcount support from I-pipe code
Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | arch/blackfin/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/blackfin/kernel/ipipe.c | 5 | ||||
| -rw-r--r-- | arch/blackfin/kernel/mcount.S | 70 |
3 files changed, 0 insertions, 76 deletions
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile index 3731088e181b..141d9281e4b0 100644 --- a/arch/blackfin/kernel/Makefile +++ b/arch/blackfin/kernel/Makefile | |||
| @@ -20,7 +20,6 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o | |||
| 20 | CFLAGS_REMOVE_ftrace.o = -pg | 20 | CFLAGS_REMOVE_ftrace.o = -pg |
| 21 | 21 | ||
| 22 | obj-$(CONFIG_IPIPE) += ipipe.o | 22 | obj-$(CONFIG_IPIPE) += ipipe.o |
| 23 | obj-$(CONFIG_IPIPE_TRACE_MCOUNT) += mcount.o | ||
| 24 | obj-$(CONFIG_BFIN_GPTIMERS) += gptimers.o | 23 | obj-$(CONFIG_BFIN_GPTIMERS) += gptimers.o |
| 25 | obj-$(CONFIG_CPLB_INFO) += cplbinfo.o | 24 | obj-$(CONFIG_CPLB_INFO) += cplbinfo.o |
| 26 | obj-$(CONFIG_MODULES) += module.o | 25 | obj-$(CONFIG_MODULES) += module.o |
diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c index 2b979edee140..b8d22034b9a6 100644 --- a/arch/blackfin/kernel/ipipe.c +++ b/arch/blackfin/kernel/ipipe.c | |||
| @@ -342,8 +342,3 @@ void ___ipipe_sync_pipeline(unsigned long syncmask) | |||
| 342 | } | 342 | } |
| 343 | 343 | ||
| 344 | EXPORT_SYMBOL(show_stack); | 344 | EXPORT_SYMBOL(show_stack); |
| 345 | |||
| 346 | #ifdef CONFIG_IPIPE_TRACE_MCOUNT | ||
| 347 | void notrace _mcount(void); | ||
| 348 | EXPORT_SYMBOL(_mcount); | ||
| 349 | #endif /* CONFIG_IPIPE_TRACE_MCOUNT */ | ||
diff --git a/arch/blackfin/kernel/mcount.S b/arch/blackfin/kernel/mcount.S deleted file mode 100644 index edcfb3865f46..000000000000 --- a/arch/blackfin/kernel/mcount.S +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/blackfin/mcount.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Analog Devices Inc. | ||
| 5 | * | ||
| 6 | * 2007/04/12 Save index, length, modify and base registers. --rpm | ||
| 7 | */ | ||
| 8 | |||
| 9 | #include <linux/linkage.h> | ||
| 10 | #include <asm/blackfin.h> | ||
| 11 | |||
| 12 | .text | ||
| 13 | |||
| 14 | .align 4 /* just in case */ | ||
| 15 | |||
| 16 | ENTRY(__mcount) | ||
| 17 | [--sp] = i0; | ||
| 18 | [--sp] = i1; | ||
| 19 | [--sp] = i2; | ||
| 20 | [--sp] = i3; | ||
| 21 | [--sp] = l0; | ||
| 22 | [--sp] = l1; | ||
| 23 | [--sp] = l2; | ||
| 24 | [--sp] = l3; | ||
| 25 | [--sp] = m0; | ||
| 26 | [--sp] = m1; | ||
| 27 | [--sp] = m2; | ||
| 28 | [--sp] = m3; | ||
| 29 | [--sp] = b0; | ||
| 30 | [--sp] = b1; | ||
| 31 | [--sp] = b2; | ||
| 32 | [--sp] = b3; | ||
| 33 | [--sp] = ( r7:0, p5:0 ); | ||
| 34 | [--sp] = ASTAT; | ||
| 35 | |||
| 36 | p1.L = _ipipe_trace_enable; | ||
| 37 | p1.H = _ipipe_trace_enable; | ||
| 38 | r7 = [p1]; | ||
| 39 | CC = r7 == 0; | ||
| 40 | if CC jump out; | ||
| 41 | link 0x10; | ||
| 42 | r0 = 0x0; | ||
| 43 | [sp + 0xc] = r0; /* v */ | ||
| 44 | r0 = 0x0; /* type: IPIPE_TRACE_FN */ | ||
| 45 | r1 = rets; | ||
| 46 | p0 = [fp]; /* p0: Prior FP */ | ||
| 47 | r2 = [p0 + 4]; /* r2: Prior RETS */ | ||
| 48 | call ___ipipe_trace; | ||
| 49 | unlink; | ||
| 50 | out: | ||
| 51 | ASTAT = [sp++]; | ||
| 52 | ( r7:0, p5:0 ) = [sp++]; | ||
| 53 | b3 = [sp++]; | ||
| 54 | b2 = [sp++]; | ||
| 55 | b1 = [sp++]; | ||
| 56 | b0 = [sp++]; | ||
| 57 | m3 = [sp++]; | ||
| 58 | m2 = [sp++]; | ||
| 59 | m1 = [sp++]; | ||
| 60 | m0 = [sp++]; | ||
| 61 | l3 = [sp++]; | ||
| 62 | l2 = [sp++]; | ||
| 63 | l1 = [sp++]; | ||
| 64 | l0 = [sp++]; | ||
| 65 | i3 = [sp++]; | ||
| 66 | i2 = [sp++]; | ||
| 67 | i1 = [sp++]; | ||
| 68 | i0 = [sp++]; | ||
| 69 | rts; | ||
| 70 | ENDPROC(__mcount) | ||
