AWE / sound + APM wq fixes.

Thomas Wouters (thomas@xs4all.nl)
Fri, 14 May 1999 11:43:14 +0200


More wq fixes (AWE/sound and APM -- the AWE one oopsed on me, the rest i saw
by accident.) Dont even think i know what i'm doing -- i just saw gcc
warnings and checked the 2.3.1 diff on how to change what. Should i be
looking at other changes as well ?

-- 
Thomas Wouters <thomas@xs4all.net>

Hi! I'm a .signature virus! copy me into your .signature file to help me spread!

--- linux/drivers/sound/dev_table.h.orig Fri May 14 11:35:37 1999 +++ linux/drivers/sound/dev_table.h Fri May 14 11:25:44 1999 @@ -234,9 +234,9 @@ int parent_dev; /* 0 -> no parent, 1 to n -> parent=parent_dev+1 */ /* fields formerly in dmabuf.c */ - struct wait_queue *in_sleeper; - struct wait_queue *out_sleeper; - struct wait_queue *poll_sleeper; + wait_queue_head_t in_sleeper; + wait_queue_head_t out_sleeper; + wait_queue_head_t poll_sleeper; /* fields formerly in audio.c */ int audio_mode; --- linux/drivers/sound/lowlevel/awe_wave.c.orig Fri May 14 11:36:24 1999 +++ linux/drivers/sound/lowlevel/awe_wave.c Fri May 14 11:02:15 1999 @@ -979,7 +979,7 @@ } #else -static struct wait_queue *awe_sleeper = NULL; +static DECLARE_WAIT_QUEUE_HEAD(awe_sleeper); static void awe_wait(unsigned short delay) { interruptible_sleep_on_timeout(&awe_sleeper, (HZ * (unsigned long)delay + 44099) / 44100); --- linux/arch/i386/kernel/apm.c.orig Fri May 14 11:36:38 1999 +++ linux/arch/i386/kernel/apm.c Fri May 14 11:12:06 1999 @@ -314,7 +314,7 @@ static int debug = 0; static int apm_disabled = 0; -static struct wait_queue * process_list = NULL; +static DECLARE_WAIT_QUEUE_HEAD(process_list); static struct apm_bios_struct * user_list = NULL; static struct timer_list apm_timer;

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/