diff options
Diffstat (limited to 'arch/sparc/kernel/time_64.c')
-rw-r--r-- | arch/sparc/kernel/time_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index c3d82b5f54ca..3fddf64c7fc6 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c | |||
@@ -659,8 +659,7 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val | |||
659 | ft->clock_tick_ref = cpu_data(cpu).clock_tick; | 659 | ft->clock_tick_ref = cpu_data(cpu).clock_tick; |
660 | } | 660 | } |
661 | if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || | 661 | if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || |
662 | (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || | 662 | (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { |
663 | (val == CPUFREQ_RESUMECHANGE)) { | ||
664 | cpu_data(cpu).clock_tick = | 663 | cpu_data(cpu).clock_tick = |
665 | cpufreq_scale(ft->clock_tick_ref, | 664 | cpufreq_scale(ft->clock_tick_ref, |
666 | ft->ref_freq, | 665 | ft->ref_freq, |
@@ -733,7 +732,7 @@ void __irq_entry timer_interrupt(int irq, struct pt_regs *regs) | |||
733 | irq_enter(); | 732 | irq_enter(); |
734 | 733 | ||
735 | local_cpu_data().irq0_irqs++; | 734 | local_cpu_data().irq0_irqs++; |
736 | kstat_incr_irqs_this_cpu(0, irq_to_desc(0)); | 735 | kstat_incr_irq_this_cpu(0); |
737 | 736 | ||
738 | if (unlikely(!evt->event_handler)) { | 737 | if (unlikely(!evt->event_handler)) { |
739 | printk(KERN_WARNING | 738 | printk(KERN_WARNING |