From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756469Ab0DFNje (ORCPT ); Tue, 6 Apr 2010 09:39:34 -0400 Received: from casper.infradead.org ([85.118.1.10]:49338 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756177Ab0DFNjO (ORCPT ); Tue, 6 Apr 2010 09:39:14 -0400 Message-Id: <20100406133141.039454288@chello.nl> User-Agent: quilt/0.47-1 Date: Tue, 06 Apr 2010 15:28:10 +0200 From: Peter Zijlstra To: mingo@elte.hu, David Miller , acme@redhat.com, paulus@samba.org, Mike Galbraith , Frederic Weisbecker , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, Peter Zijlstra Subject: [patch 3/3] sched: Use local_irq_save_nmi() in cpu_clock() References: <20100406132807.698467930@chello.nl> Content-Disposition: inline; filename=sched-clock-nmi.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since we can call cpu_clock() from NMI context fix up the IRQ disabling to conform to the new rules. Signed-off-by: Peter Zijlstra --- kernel/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/kernel/sched_clock.c =================================================================== --- linux-2.6.orig/kernel/sched_clock.c +++ linux-2.6/kernel/sched_clock.c @@ -241,9 +241,9 @@ unsigned long long cpu_clock(int cpu) unsigned long long clock; unsigned long flags; - local_irq_save(flags); + local_irq_save_nmi(flags); clock = sched_clock_cpu(cpu); - local_irq_restore(flags); + local_irq_restore_nmi(flags); return clock; }