diff options
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/perf_event.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index bb133d10b145..ebc0cd20b35d 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -71,7 +71,6 @@ void r4k_wait_irqoff(void) | |||
71 | local_irq_enable(); | 71 | local_irq_enable(); |
72 | __asm__(" .globl __pastwait \n" | 72 | __asm__(" .globl __pastwait \n" |
73 | "__pastwait: \n"); | 73 | "__pastwait: \n"); |
74 | return; | ||
75 | } | 74 | } |
76 | 75 | ||
77 | /* | 76 | /* |
diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c index a8244854d3dc..ff1840f8e764 100644 --- a/arch/mips/kernel/perf_event.c +++ b/arch/mips/kernel/perf_event.c | |||
@@ -192,8 +192,6 @@ again: | |||
192 | 192 | ||
193 | local64_add(delta, &event->count); | 193 | local64_add(delta, &event->count); |
194 | local64_sub(delta, &hwc->period_left); | 194 | local64_sub(delta, &hwc->period_left); |
195 | |||
196 | return; | ||
197 | } | 195 | } |
198 | 196 | ||
199 | static void mipspmu_start(struct perf_event *event, int flags) | 197 | static void mipspmu_start(struct perf_event *event, int flags) |