2 May 2005 08:18
[PATCH] i386/apm: use wait_event_interruptible_timeout()
Nishanth Aravamudan <nacc <at> us.ibm.com>
2005-05-02 06:18:24 GMT
2005-05-02 06:18:24 GMT
Use wait_event_interruptible_timeout() instead of custom wait-queue.
Signed-off-by: Nishanth Aravamudan <nacc <at> us.ibm.com>
--- 2.6.12-rc3/arch/i386/kernel/apm.c 2005-04-29 11:03:03.000000000 -0700
+++ 2.6.12-rc3-dev/arch/i386/kernel/apm.c 2005-05-01 19:02:48.000000000 -0700
<at> <at> -224,6 +224,7 <at> <at>
#include <linux/smp_lock.h>
#include <linux/dmi.h>
#include <linux/suspend.h>
+#include <linux/wait.h>
#include <asm/system.h>
#include <asm/uaccess.h>
<at> <at> -1418,22 +1419,15 <at> <at> static void apm_event_handler(void)
static void apm_mainloop(void)
{
- DECLARE_WAITQUEUE(wait, current);
-
- add_wait_queue(&apm_waitqueue, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
- for (;;) {
- schedule_timeout(APM_CHECK_TIMEOUT);
- if (exit_kapmd)
- break;
+ do {
+ wait_event_interruptible_timeout(apm_waitqueue,
+ exit_kapmd, APM_CHECK_TIMEOUT);
/*
(Continue reading)
RSS Feed