diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /arch/i386/kernel/apm.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/i386/kernel/apm.c')
| -rw-r--r-- | arch/i386/kernel/apm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index 6eba89025..7931e8df8 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -314,7 +314,7 @@ static int got_clock_diff = 0; 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; @@ -1017,7 +1017,7 @@ static ssize_t do_read(struct file *fp, char *buf, size_t count, loff_t *ppos) struct apm_bios_struct * as; int i; apm_event_t event; - struct wait_queue wait = { current, NULL }; + DECLARE_WAITQUEUE(wait, current); as = fp->private_data; if (check_apm_bios_struct(as, "read")) |