diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-02-10 10:43:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 19:51:20 +0100 |
| commit | 7c101b7b13707f84791441fd04f11cf710d0d2d9 (patch) | |
| tree | 2895be6cebf1c41a2c6a582b85d54ab4a9f22ae0 | |
| parent | [PATCH] m68k: don't include asm-m68k/page.h in asm-m68k/user.h (diff) | |
| download | linux-7c101b7b13707f84791441fd04f11cf710d0d2d9.tar.xz linux-7c101b7b13707f84791441fd04f11cf710d0d2d9.zip | |
[PATCH] CRIS: local_irq_disable() is redundant after local_irq_save()
arch/cris/arch-v10/kernel/time.c::get_ns_in_jiffie() contains
local_irq_disable() call after local_irq_save(). This looks redundant.
arch/cris/kernel/time.c::do_gettimeofday() contains local_irq_disable() call
after local_irq_save(). This looks redundant.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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) 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/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) unsigned long flags; signed long usec, sec; local_irq_save(flags); - local_irq_disable(); usec = do_gettimeoffset(); /* |