git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
upgrade to linux 2.6.10-1.12_FC2
[linux-2.6.git]
/
arch
/
um
/
kernel
/
time_kern.c
diff --git
a/arch/um/kernel/time_kern.c
b/arch/um/kernel/time_kern.c
index
5ce5668
..
aee0f7f
100644
(file)
--- a/
arch/um/kernel/time_kern.c
+++ b/
arch/um/kernel/time_kern.c
@@
-169,11
+169,9
@@
void __const_udelay(um_udelay_t usecs)
void timer_handler(int sig, union uml_pt_regs *regs)
{
-#ifdef CONFIG_SMP
local_irq_disable();
update_process_times(user_context(UPT_SP(regs)));
local_irq_enable();
-#endif
if(current_thread->cpu == 0)
timer_irq(regs);
}