From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759283AbXFWN0G (ORCPT ); Sat, 23 Jun 2007 09:26:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758134AbXFWNWM (ORCPT ); Sat, 23 Jun 2007 09:22:12 -0400 Received: from www.osadl.org ([213.239.205.134]:59241 "EHLO mail.tglx.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757999AbXFWNWF (ORCPT ); Sat, 23 Jun 2007 09:22:05 -0400 Message-Id: <20070623124030.665883517@inhelltoy.tec.linutronix.de> References: <20070623124005.931747831@inhelltoy.tec.linutronix.de> User-Agent: quilt/0.46-1 Date: Sat, 23 Jun 2007 13:32:37 -0000 From: Thomas Gleixner To: Andrew Morton Cc: Andi Kleen , Ingo Molnar , Arjan van de Ven , Venkatesh Pallipadi , John Stultz , Chris Wright , LKML Subject: [patch -mm 12/28] pcspkr: use the global PIT lock Content-Disposition: inline; filename=pcspkr-use-the-global-pit-lock.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Replace the pcspkr private PIT lock by the global PIT lock to serialize the PIT access all over the place. Signed-off-by: Thomas Gleixner --- arch/x86_64/kernel/time.c | 2 ++ drivers/input/misc/pcspkr.c | 11 ++++++++--- include/asm-x86_64/i8253.h | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) Index: linux-2.6.22-rc4-mm/arch/x86_64/kernel/time.c =================================================================== --- linux-2.6.22-rc4-mm.orig/arch/x86_64/kernel/time.c 2007-06-23 14:38:56.000000000 +0200 +++ linux-2.6.22-rc4-mm/arch/x86_64/kernel/time.c 2007-06-23 14:38:58.000000000 +0200 @@ -33,6 +33,7 @@ #include #endif #include +#include #include #include #include @@ -51,6 +52,7 @@ static char *timename = NULL; DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); DEFINE_SPINLOCK(i8253_lock); +EXPORT_SYMBOL(i8253_lock); volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; Index: linux-2.6.22-rc4-mm/drivers/input/misc/pcspkr.c =================================================================== --- linux-2.6.22-rc4-mm.orig/drivers/input/misc/pcspkr.c 2007-06-23 14:38:56.000000000 +0200 +++ linux-2.6.22-rc4-mm/drivers/input/misc/pcspkr.c 2007-06-23 14:38:58.000000000 +0200 @@ -24,7 +24,12 @@ MODULE_AUTHOR("Vojtech Pavlik +#else +static DEFINE_SPINLOCK(i8253_lock); +#endif static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) { @@ -43,7 +48,7 @@ static int pcspkr_event(struct input_dev if (value > 20 && value < 32767) count = PIT_TICK_RATE / value; - spin_lock_irqsave(&i8253_beep_lock, flags); + spin_lock_irqsave(&i8253_lock, flags); if (count) { /* enable counter 2 */ @@ -58,7 +63,7 @@ static int pcspkr_event(struct input_dev outb(inb_p(0x61) & 0xFC, 0x61); } - spin_unlock_irqrestore(&i8253_beep_lock, flags); + spin_unlock_irqrestore(&i8253_lock, flags); return 0; } Index: linux-2.6.22-rc4-mm/include/asm-x86_64/i8253.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.22-rc4-mm/include/asm-x86_64/i8253.h 2007-06-23 14:38:58.000000000 +0200 @@ -0,0 +1,6 @@ +#ifndef __ASM_I8253_H__ +#define __ASM_I8253_H__ + +extern spinlock_t i8253_lock; + +#endif /* __ASM_I8253_H__ */ --