aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/leon_kernel.c2
-rw-r--r--arch/sparc/kernel/perf_event.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 87f1760c0aa2..554e0b80bcde 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -124,7 +124,7 @@ void __init leon_init_timers(irq_handler_t counter_fn)
124 124
125 if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) & 125 if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &
126 (1<<LEON3_GPTIMER_SEPIRQ))) { 126 (1<<LEON3_GPTIMER_SEPIRQ))) {
127 prom_printf("irq timer not configured with seperate irqs \n"); 127 prom_printf("irq timer not configured with separate irqs \n");
128 BUG(); 128 BUG();
129 } 129 }
130 130
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index e856456ec02f..a565ee5146eb 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1353,7 +1353,7 @@ static void perf_callchain_user_32(struct pt_regs *regs,
1353} 1353}
1354 1354
1355/* Like powerpc we can't get PMU interrupts within the PMU handler, 1355/* Like powerpc we can't get PMU interrupts within the PMU handler,
1356 * so no need for seperate NMI and IRQ chains as on x86. 1356 * so no need for separate NMI and IRQ chains as on x86.
1357 */ 1357 */
1358static DEFINE_PER_CPU(struct perf_callchain_entry, callchain); 1358static DEFINE_PER_CPU(struct perf_callchain_entry, callchain);
1359 1359