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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
m68k
/
kernel
/
time.c
diff --git
a/arch/m68k/kernel/time.c
b/arch/m68k/kernel/time.c
index
4926b38
..
06438da
100644
(file)
--- a/
arch/m68k/kernel/time.c
+++ b/
arch/m68k/kernel/time.c
@@
-42,9
+42,7
@@
static inline int set_rtc_mmss(unsigned long nowtime)
static irqreturn_t timer_interrupt(int irq, void *dummy)
{
do_timer(1);
-#ifndef CONFIG_SMP
update_process_times(user_mode(get_irq_regs()));
-#endif
profile_tick(CPU_PROFILING);
#ifdef CONFIG_HEARTBEAT