diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 1 | ||||
| -rw-r--r-- | arch/cris/kernel/time.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index ebacf1457d91..077e973c33f0 100644 --- 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) | |||
| 38 | unsigned long flags; | 38 | unsigned long flags; |
| 39 | 39 | ||
| 40 | local_irq_save(flags); | 40 | local_irq_save(flags); |
| 41 | local_irq_disable(); | ||
| 42 | timer_count = *R_TIMER0_DATA; | 41 | timer_count = *R_TIMER0_DATA; |
| 43 | presc_count = *R_TIM_PRESC_STATUS; | 42 | presc_count = *R_TIM_PRESC_STATUS; |
| 44 | /* presc_count might be wrapped */ | 43 | /* presc_count might be wrapped */ |
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 0f9213cbd48e..22a1aa511aea 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
| @@ -55,7 +55,6 @@ void do_gettimeofday(struct timeval *tv) | |||
| 55 | unsigned long flags; | 55 | unsigned long flags; |
| 56 | signed long usec, sec; | 56 | signed long usec, sec; |
| 57 | local_irq_save(flags); | 57 | local_irq_save(flags); |
| 58 | local_irq_disable(); | ||
| 59 | usec = do_gettimeoffset(); | 58 | usec = do_gettimeoffset(); |
| 60 | 59 | ||
| 61 | /* | 60 | /* |