lkml.org 
[lkml]   [2002]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH] 21/41 sound/oss/sound_timer.c - convert cli to spinlocks
From
--- vanilla-2.5.32/sound/oss/sound_timer.c	Sat Apr 20 18:25:21 2002
+++ linux-2.5-cli-oss/sound/oss/sound_timer.c Thu Aug 15 14:20:44 2002
@@ -12,7 +12,7 @@
* Thomas Sailer : ioctl code reworked (vmalloc/vfree removed)
*/
#include <linux/string.h>
-
+#include <linux/spinlock.h>

#include "sound_config.h"

@@ -26,6 +26,7 @@
static volatile unsigned long usecs_per_tmr; /* Length of the current interval */

static struct sound_lowlev_timer *tmr;
+static spinlock_t lock;

static unsigned long tmr2ticks(int tmr_value)
{
@@ -80,15 +81,14 @@
{
unsigned long flags;

- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock,flags);
tmr_offs = 0;
ticks_offs = 0;
tmr_ctr = 0;
next_event_time = (unsigned long) -1;
prev_event_time = 0;
curr_ticks = 0;
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
}

static int timer_open(int dev, int mode)
@@ -278,6 +278,8 @@

void sound_timer_interrupt(void)
{
+ unsigned long flags;
+
if (!opened)
return;

@@ -286,6 +288,7 @@
if (!tmr_running)
return;

+ spin_lock_irqsave(&lock,flags);
tmr_ctr++;
curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);

@@ -294,6 +297,7 @@
next_event_time = (unsigned long) -1;
sequencer_timer(0);
}
+ spin_unlock_irqrestore(&lock,flags);
}

void sound_timer_init(struct sound_lowlev_timer *t, char *name)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:28    [W:0.020 / U:1.968 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site