diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-03-25 13:08:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-01 14:22:59 +0200 |
| commit | db6f672ef11d7a3c5aa128a3c3e57c92580a25f7 (patch) | |
| tree | ae952d977285371a08f1ab951e2c8830ccd08429 /kernel/time/clockevents.c | |
| parent | c1797baf6880174f899ce3960d0598f5bbeeb7ff (diff) | |
| download | linux-stable-db6f672ef11d7a3c5aa128a3c3e57c92580a25f7.tar.gz linux-stable-db6f672ef11d7a3c5aa128a3c3e57c92580a25f7.tar.bz2 linux-stable-db6f672ef11d7a3c5aa128a3c3e57c92580a25f7.zip | |
clockevents: Remove extra local_irq_save() in clockevents_exchange_device()
Called with 'clockevents_lock' held and interrupts disabled
already.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/51005827.yXt5tjZMBs@vostro.rjw.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/clockevents.c')
| -rw-r--r-- | kernel/time/clockevents.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 3531beecbe95..b73002718536 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c @@ -595,14 +595,12 @@ void clockevents_handle_noop(struct clock_event_device *dev) * @old: device to release (can be NULL) * @new: device to request (can be NULL) * - * Called from the notifier chain. clockevents_lock is held already + * Called from various tick functions with clockevents_lock held and + * interrupts disabled. */ void clockevents_exchange_device(struct clock_event_device *old, struct clock_event_device *new) { - unsigned long flags; - - local_irq_save(flags); /* * Caller releases a clock event device. We queue it into the * released list and do a notify add later. @@ -618,7 +616,6 @@ void clockevents_exchange_device(struct clock_event_device *old, BUG_ON(new->state != CLOCK_EVT_STATE_DETACHED); clockevents_shutdown(new); } - local_irq_restore(flags); } /** |