---

yaml --- r: 47437 b: refs/heads/master c: 7c101b7 h: refs/heads/master i: 47435: 4816632 v: v3
git-mirror · Feb 11, 2007 · 1b3fedf · 1b3fedf
1 parent adc274b
commit 1b3fedf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36dbf95868007b2dd236836f5420d3cb788da029
+refs/heads/master: 7c101b7b13707f84791441fd04f11cf710d0d2d9
diff --git a/trunk/arch/cris/arch-v10/kernel/time.c b/trunk/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 */

diff --git a/trunk/arch/cris/kernel/time.c b/trunk/arch/cris/kernel/time.c
@@ -55,7 +55,6 @@ void do_gettimeofday(struct timeval *tv)
 	unsigned long flags;
 	signed long usec, sec;
 	local_irq_save(flags);
-	local_irq_disable();
 	usec = do_gettimeoffset();
 
         /*