Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use i8253.c lock for PC speaker on MIPS, too.

Browse Source 
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>
This commit is contained in:
Ralf Baechle 2007-11-02 17:26:06 +00:00 committed by Linus Torvalds
parent a89b7717a8
commit 74521c28e5
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/kernel/i8253.c
View File

@ -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.

2
drivers/input/misc/pcspkr.c
View File

@ -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

4
include/asm-mips/i8253.h
View File

@ -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 */