projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
cris
/
arch-v10
/
kernel
/
time.c
diff --git
a/arch/cris/arch-v10/kernel/time.c
b/arch/cris/arch-v10/kernel/time.c
index ebacf1457d914cacae4069c21094639fbc906dd7..077e973c33f0c131be44a9c8e32fd4c149b61528 100644
(file)
--- a/
arch/cris/arch-v10/kernel/time.c
+++ b/
arch/cris/arch-v10/kernel/time.c
@@
-38,7
+38,6
@@
unsigned long get_ns_in_jiffie(void)
unsigned long flags;
local_irq_save(flags);
- local_irq_disable();
timer_count = *R_TIMER0_DATA;
presc_count = *R_TIM_PRESC_STATUS;
/* presc_count might be wrapped */