From 1b3fedf3bf4aaf9af7e3eda40fc60c8151afba03 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Sat, 10 Feb 2007 01:43:49 -0800 Subject: [PATCH] --- yaml --- r: 47437 b: refs/heads/master c: 7c101b7b13707f84791441fd04f11cf710d0d2d9 h: refs/heads/master i: 47435: 4816632ed7cfa0e59d4d1bf1c65d9ec769ede823 v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/time.c | 1 - trunk/arch/cris/kernel/time.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95f26e863c5e..363bee5dc92e 100644 --- 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 index ebacf1457d91..077e973c33f0 100644 --- 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 index 0f9213cbd48e..22a1aa511aea 100644 --- 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(); /*