From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753241AbbDBMaY (ORCPT ); Thu, 2 Apr 2015 08:30:24 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60634 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751306AbbDBMaV (ORCPT ); Thu, 2 Apr 2015 08:30:21 -0400 Date: Thu, 2 Apr 2015 05:29:48 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, rafael.j.wysocki@intel.com Reply-To: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, rafael.j.wysocki@intel.com In-Reply-To: <51005827.yXt5tjZMBs@vostro.rjw.lan> References: <51005827.yXt5tjZMBs@vostro.rjw.lan> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] clockevents: Remove extra local_irq_save() in clockevents_exchange_device() Git-Commit-ID: db6f672ef11d7a3c5aa128a3c3e57c92580a25f7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: db6f672ef11d7a3c5aa128a3c3e57c92580a25f7 Gitweb: http://git.kernel.org/tip/db6f672ef11d7a3c5aa128a3c3e57c92580a25f7 Author: Thomas Gleixner AuthorDate: Wed, 25 Mar 2015 13:08:27 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Apr 2015 14:22:59 +0200 clockevents: Remove extra local_irq_save() in clockevents_exchange_device() Called with 'clockevents_lock' held and interrupts disabled already. Signed-off-by: Thomas Gleixner Signed-off-by: Rafael J. Wysocki Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/51005827.yXt5tjZMBs@vostro.rjw.lan Signed-off-by: Ingo Molnar --- kernel/time/clockevents.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 3531bee..b730027 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); } /**