From: Nishanth Aravamudan <nacc@us.ibm.com>
To: sfr@canb.auug.org.au
Cc: linux-laptop@vger.kernel.org,
Kernel-Janitors <kernel-janitors@lists.osdl.org>
Subject: [PATCH] i386/apm: use wait_event_interruptible_timeout()
Date: Sun, 1 May 2005 23:18:24 -0700 [thread overview]
Message-ID: <20050502061824.GC10173@us.ibm.com> (raw)
In-Reply-To: <20050502061446.GB10173@us.ibm.com>
Use wait_event_interruptible_timeout() instead of custom wait-queue.
Signed-off-by: Nishanth Aravamudan <nacc@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
@@ -224,6 +224,7 @@
#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>
@@ -1418,22 +1419,15 @@ 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);
/*
* Ok, check all events, check for idle (and mark us sleeping
* so as not to count towards the load average)..
*/
- set_current_state(TASK_INTERRUPTIBLE);
apm_event_handler();
- }
- remove_wait_queue(&apm_waitqueue, &wait);
+ } while (!exit_kapmd);
}
static int check_apm_user(struct apm_user *as, const char *func)
next parent reply other threads:[~2005-05-02 6:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050502061446.GB10173@us.ibm.com>
2005-05-02 6:18 ` Nishanth Aravamudan [this message]
2005-05-03 21:40 ` [KJ] [PATCH] i386/apm: use wait_event_interruptible_timeout() Nishanth Aravamudan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050502061824.GC10173@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-laptop@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).