diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/pcic.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/time.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 4cd5d7818dc..a6a6f982337 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -713,10 +713,10 @@ static irqreturn_t pcic_timer_handler (int irq, void *h) | |||
713 | write_seqlock(&xtime_lock); /* Dummy, to show that we remember */ | 713 | write_seqlock(&xtime_lock); /* Dummy, to show that we remember */ |
714 | pcic_clear_clock_irq(); | 714 | pcic_clear_clock_irq(); |
715 | do_timer(1); | 715 | do_timer(1); |
716 | write_sequnlock(&xtime_lock); | ||
716 | #ifndef CONFIG_SMP | 717 | #ifndef CONFIG_SMP |
717 | update_process_times(user_mode(get_irq_regs())); | 718 | update_process_times(user_mode(get_irq_regs())); |
718 | #endif | 719 | #endif |
719 | write_sequnlock(&xtime_lock); | ||
720 | return IRQ_HANDLED; | 720 | return IRQ_HANDLED; |
721 | } | 721 | } |
722 | 722 | ||
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 00b393c3a4a..cfaf22c05bc 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -128,10 +128,6 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
128 | clear_clock_irq(); | 128 | clear_clock_irq(); |
129 | 129 | ||
130 | do_timer(1); | 130 | do_timer(1); |
131 | #ifndef CONFIG_SMP | ||
132 | update_process_times(user_mode(get_irq_regs())); | ||
133 | #endif | ||
134 | |||
135 | 131 | ||
136 | /* Determine when to update the Mostek clock. */ | 132 | /* Determine when to update the Mostek clock. */ |
137 | if (ntp_synced() && | 133 | if (ntp_synced() && |
@@ -145,6 +141,9 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
145 | } | 141 | } |
146 | write_sequnlock(&xtime_lock); | 142 | write_sequnlock(&xtime_lock); |
147 | 143 | ||
144 | #ifndef CONFIG_SMP | ||
145 | update_process_times(user_mode(get_irq_regs())); | ||
146 | #endif | ||
148 | return IRQ_HANDLED; | 147 | return IRQ_HANDLED; |
149 | } | 148 | } |
150 | 149 | ||