Use i8253.c lock for PC speaker on MIPS, too. (74521c28) · Commits · 戴 / test

The Jazz machines have to use the PIT timer for dyntick and highresolution kernels. This may break because currently just like i386 used to do MIPS uses two separate spinlocks in the actual PIT code and the PC speaker code. So switch to do it the same that x86 currently does PIT locking. Signed-off-by:

Ralf Baechle <ralf@linux-mips.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/mips/kernel/i8253.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#include <asm/io.h>
		#include <asm/time.h>

		static DEFINE_SPINLOCK(i8253_lock);
		DEFINE_SPINLOCK(i8253_lock);

		/*
		* Initialize the PIT timer.

drivers/input/misc/pcspkr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("PC Speaker beeper driver");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("platform:pcspkr");

		#ifdef CONFIG_X86
		#if defined(CONFIG_MIPS) \|\| defined(CONFIG_X86)
		/* Use the global PIT lock ! */
		#include <asm/i8253.h>
		#else

include/asm-mips/i8253.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,11 +5,15 @@
		#ifndef __ASM_I8253_H
		#define __ASM_I8253_H

		#include <linux/spinlock.h>

		/* i8253A PIT registers */
		#define PIT_MODE 0x43
		#define PIT_CH0 0x40
		#define PIT_CH2 0x42

		extern spinlock_t i8253_lock;

		extern void setup_pit_timer(void);

		#endif /* __ASM_I8253_H */

Admin message