git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
oss
/
sys_timer.c
diff --git
a/sound/oss/sys_timer.c
b/sound/oss/sys_timer.c
index
3b7fa02
..
1075344
100644
(file)
--- a/
sound/oss/sys_timer.c
+++ b/
sound/oss/sys_timer.c
@@
-1,5
+1,5
@@
/*
/*
- * sound/sys_timer.c
+ * sound/
oss/
sys_timer.c
*
* The default timer for the Level 2 sequencer interface
* Uses the (1/HZ sec) timer of kernel.
*
* The default timer for the Level 2 sequencer interface
* Uses the (1/HZ sec) timer of kernel.
@@
-27,9
+27,8
@@
static volatile unsigned long next_event_time;
static unsigned long prev_event_time;
static void poll_def_tmr(unsigned long dummy);
static unsigned long prev_event_time;
static void poll_def_tmr(unsigned long dummy);
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
-
-static struct timer_list def_tmr = TIMER_INITIALIZER(poll_def_tmr, 0, 0);
+static DEFINE_SPINLOCK(lock);
+static DEFINE_TIMER(def_tmr, poll_def_tmr, 0, 0);
static unsigned long
tmr2ticks(int tmr_value)
static unsigned long
tmr2ticks(int tmr_value)