From mboxrd@z Thu Jan 1 00:00:00 1970 From: soren.brinkmann@xilinx.com (Soren Brinkmann) Date: Tue, 26 Nov 2013 17:04:51 -0800 Subject: [PATCH v2 4/9] clocksource/cadence_ttc: Use enable/disable_irq In-Reply-To: <1385514296-26702-1-git-send-email-soren.brinkmann@xilinx.com> References: <1385514296-26702-1-git-send-email-soren.brinkmann@xilinx.com> Message-ID: <1385514296-26702-5-git-send-email-soren.brinkmann@xilinx.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org To ensure that the timer interrupt is properly enabled/disabled across the whole CPU cluster use enable/disable_irq() instead of local_irq_disable(). Signed-off-by: Soren Brinkmann --- drivers/clocksource/cadence_ttc_timer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c index a92350b55d32..246d018d1e63 100644 --- a/drivers/clocksource/cadence_ttc_timer.c +++ b/drivers/clocksource/cadence_ttc_timer.c @@ -322,18 +322,16 @@ static int ttc_rate_change_clockevent_cb(struct notifier_block *nb, switch (event) { case POST_RATE_CHANGE: { - unsigned long flags; - /* * clockevents_update_freq should be called with IRQ disabled on * the CPU the timer provides events for. The timer we use is * common to both CPUs, not sure if we need to run on both * cores. */ - local_irq_save(flags); + disable_irq(ttcce->ce.irq); clockevents_update_freq(&ttcce->ce, ndata->new_rate / PRESCALE); - local_irq_restore(flags); + enable_irq(ttcce->ce.irq); /* update cached frequency */ ttc->freq = ndata->new_rate; -- 1.8.4.4