git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
time.c
diff --git
a/arch/m68knommu/kernel/time.c
b/arch/m68knommu/kernel/time.c
index
a90acf5
..
7089dd9
100644
(file)
--- a/
arch/m68knommu/kernel/time.c
+++ b/
arch/m68knommu/kernel/time.c
@@
-50,9
+50,8
@@
irqreturn_t arch_timer_interrupt(int irq, void *dummy)
write_sequnlock(&xtime_lock);
write_sequnlock(&xtime_lock);
-#ifndef CONFIG_SMP
update_process_times(user_mode(get_irq_regs()));
update_process_times(user_mode(get_irq_regs()));
-#endif
+
return(IRQ_HANDLED);
}
#endif
return(IRQ_HANDLED);
}
#endif