diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 08:17:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 08:17:35 -0700 |
commit | 1014cfe2fb4cdd663137aafb21448cb613dd6a7d (patch) | |
tree | 13b5fc4e7036b4226d94bd33aefb74a3dbb25b6a /sound/drivers/pcsp/pcsp.h | |
parent | 8123d8f17d8ba9d67e556688e4f025456ca97842 (diff) | |
parent | 4726f2a617ebd868a4fdeb5679613b897e5f1676 (diff) | |
download | op-kernel-dev-1014cfe2fb4cdd663137aafb21448cb613dd6a7d.zip op-kernel-dev-1014cfe2fb4cdd663137aafb21448cb613dd6a7d.tar.gz |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: Reduce stack_trace usage
lockdep: No need to disable preemption in debug atomic ops
lockdep: Actually _dec_ in debug_atomic_dec
lockdep: Provide off case for redundant_hardirqs_on increment
lockdep: Simplify debug atomic ops
lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
lockstat: Make lockstat counting per cpu
i8253: Convert i8253_lock to raw_spinlock
Diffstat (limited to 'sound/drivers/pcsp/pcsp.h')
-rw-r--r-- | sound/drivers/pcsp/pcsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h index 1e12307..4ff6c8c 100644 --- a/sound/drivers/pcsp/pcsp.h +++ b/sound/drivers/pcsp/pcsp.h @@ -16,7 +16,7 @@ #include <asm/i8253.h> #else #include <asm/8253pit.h> -static DEFINE_SPINLOCK(i8253_lock); +static DEFINE_RAW_SPINLOCK(i8253_lock); #endif #define PCSP_SOUND_VERSION 0x400 /* read 4.00 */ |