* [KJ] [PATCH] net/3c505: replace schedule_timeout() with msleep()
@ 2005-05-02 6:14 ` Nishanth Aravamudan
0 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:14 UTC (permalink / raw)
To: philb; +Cc: netdev, Kernel-Janitors
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
Use msleep() instead of schedule_timeout() to guarantee the task delays
as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.12-rc3/drivers/net/3c505.c 2005-04-29 11:03:04.000000000 -0700
+++ 2.6.12-rc3-dev/drivers/net/3c505.c 2005-05-01 20:52:01.000000000 -0700
@@ -1317,8 +1317,7 @@ static int __init elp_sense(struct net_d
if (orig_HSR & DIR) {
/* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */
outb(0, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (inb_status(addr) & DIR) {
if (elp_debug > 0)
printk(notfound_msg, 2);
@@ -1327,8 +1326,7 @@ static int __init elp_sense(struct net_d
} else {
/* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */
outb(DIR, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (!(inb_status(addr) & DIR)) {
if (elp_debug > 0)
printk(notfound_msg, 3);
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* [KJ] [PATCH] net/3c505: replace schedule_timeout() with msleep()
@ 2005-05-02 6:14 ` Nishanth Aravamudan
0 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:14 UTC (permalink / raw)
To: philb; +Cc: netdev, Kernel-Janitors
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
Use msleep() instead of schedule_timeout() to guarantee the task delays
as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.12-rc3/drivers/net/3c505.c 2005-04-29 11:03:04.000000000 -0700
+++ 2.6.12-rc3-dev/drivers/net/3c505.c 2005-05-01 20:52:01.000000000 -0700
@@ -1317,8 +1317,7 @@ static int __init elp_sense(struct net_d
if (orig_HSR & DIR) {
/* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */
outb(0, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (inb_status(addr) & DIR) {
if (elp_debug > 0)
printk(notfound_msg, 2);
@@ -1327,8 +1326,7 @@ static int __init elp_sense(struct net_d
} else {
/* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */
outb(DIR, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (!(inb_status(addr) & DIR)) {
if (elp_debug > 0)
printk(notfound_msg, 3);
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* [KJ] [PATCH] i386/apm: use wait_event_interruptible_timeout()
2005-05-02 6:14 ` Nishanth Aravamudan
@ 2005-05-02 6:18 ` Nishanth Aravamudan
-1 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:18 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1192 bytes --]
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)
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] i386/apm: use wait_event_interruptible_timeout()
@ 2005-05-02 6:18 ` Nishanth Aravamudan
0 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:18 UTC (permalink / raw)
To: sfr; +Cc: linux-laptop, Kernel-Janitors
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)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [KJ] [PATCH] ppc/fcc_enet: replace schedule_timeout() with ssleep()
2005-05-02 6:14 ` Nishanth Aravamudan
@ 2005-05-02 6:26 ` Nishanth Aravamudan
-1 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:26 UTC (permalink / raw)
To: dmalek; +Cc: Kernel-Janitors, linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
I couldn't find an appropriate entry in MAINTAINERS for this patch.
Use ssleep() instead of schedule_timeout() to guarantee the task delays
as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.12-rc3/arch/ppc/8260_io/fcc_enet.c 2005-04-29 11:03:03.000000000 -0700
+++ 2.6.12-rc3-dev/arch/ppc/8260_io/fcc_enet.c 2005-05-01 19:10:58.000000000 -0700
@@ -1305,12 +1305,11 @@ static void mii_parse_dm9161_scsr(uint m
static void mii_dm9161_wait(uint mii_reg, struct net_device *dev)
{
- int timeout = HZ;
+ int timeout_secs = 1;
/* Davicom takes a bit to come up after a reset,
* so wait here for a bit */
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(timeout);
+ ssleep(timeout_secs);
}
static phy_info_t phy_info_dm9161 = {
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] ppc/fcc_enet: replace schedule_timeout() with ssleep()
@ 2005-05-02 6:26 ` Nishanth Aravamudan
0 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:26 UTC (permalink / raw)
To: dmalek; +Cc: Kernel-Janitors, linuxppc-embedded
I couldn't find an appropriate entry in MAINTAINERS for this patch.
Use ssleep() instead of schedule_timeout() to guarantee the task delays
as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.12-rc3/arch/ppc/8260_io/fcc_enet.c 2005-04-29 11:03:03.000000000 -0700
+++ 2.6.12-rc3-dev/arch/ppc/8260_io/fcc_enet.c 2005-05-01 19:10:58.000000000 -0700
@@ -1305,12 +1305,11 @@ static void mii_parse_dm9161_scsr(uint m
static void mii_dm9161_wait(uint mii_reg, struct net_device *dev)
{
- int timeout = HZ;
+ int timeout_secs = 1;
/* Davicom takes a bit to come up after a reset,
* so wait here for a bit */
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(timeout);
+ ssleep(timeout_secs);
}
static phy_info_t phy_info_dm9161 = {
^ permalink raw reply [flat|nested] 10+ messages in thread
* [KJ] [PATCH] net/slip: replace schedule_timeout() with
2005-05-02 6:14 ` Nishanth Aravamudan
@ 2005-05-02 6:34 ` Nishanth Aravamudan
-1 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:34 UTC (permalink / raw)
To: loz, waltje; +Cc: netdev, Kernel-Janitors
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Use msleep_interruptible() instead of schedule_timeout() to guarantee
the task delays as expected.
--- 2.6.12-rc3/drivers/net/slip.c 2005-03-01 23:38:33.000000000 -0800
+++ 2.6.12-rc3-dev/drivers/net/slip.c 2005-05-01 20:53:08.000000000 -0700
@@ -1395,10 +1395,8 @@ static void __exit slip_exit(void)
/* First of all: check for active disciplines and hangup them.
*/
do {
- if (busy) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
- }
+ if (busy)
+ msleep_interruptible(100);
busy = 0;
for (i = 0; i < slip_maxdev; i++) {
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* [KJ] [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible()
@ 2005-05-02 6:34 ` Nishanth Aravamudan
0 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:34 UTC (permalink / raw)
To: loz, waltje; +Cc: netdev, Kernel-Janitors
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Use msleep_interruptible() instead of schedule_timeout() to guarantee
the task delays as expected.
--- 2.6.12-rc3/drivers/net/slip.c 2005-03-01 23:38:33.000000000 -0800
+++ 2.6.12-rc3-dev/drivers/net/slip.c 2005-05-01 20:53:08.000000000 -0700
@@ -1395,10 +1395,8 @@ static void __exit slip_exit(void)
/* First of all: check for active disciplines and hangup them.
*/
do {
- if (busy) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
- }
+ if (busy)
+ msleep_interruptible(100);
busy = 0;
for (i = 0; i < slip_maxdev; i++) {
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [KJ] [PATCH] i386/apm: use wait_event_interruptible_timeout()
2005-05-02 6:18 ` Nishanth Aravamudan
@ 2005-05-03 21:40 ` Nishanth Aravamudan
-1 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-03 21:40 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
On 01.05.2005 [23:18:24 -0700], Nishanth Aravamudan wrote:
> 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);
Hmm, this will lead to some not so subtle breakage with wait-queues.
Please do not apply.
Thanks,
Nish
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [KJ] [PATCH] i386/apm: use wait_event_interruptible_timeout()
@ 2005-05-03 21:40 ` Nishanth Aravamudan
0 siblings, 0 replies; 10+ messages in thread
From: Nishanth Aravamudan @ 2005-05-03 21:40 UTC (permalink / raw)
To: sfr; +Cc: Kernel-Janitors, linux-laptop
On 01.05.2005 [23:18:24 -0700], Nishanth Aravamudan wrote:
> 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);
Hmm, this will lead to some not so subtle breakage with wait-queues.
Please do not apply.
Thanks,
Nish
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2005-05-03 21:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-02 6:14 [KJ] [PATCH] net/3c505: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-05-02 6:14 ` Nishanth Aravamudan
2005-05-02 6:26 ` [KJ] [PATCH] ppc/fcc_enet: replace schedule_timeout() with ssleep() Nishanth Aravamudan
2005-05-02 6:26 ` Nishanth Aravamudan
2005-05-02 6:34 ` [KJ] [PATCH] net/slip: replace schedule_timeout() with Nishanth Aravamudan
2005-05-02 6:34 ` [KJ] [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible() Nishanth Aravamudan
-- strict thread matches above, loose matches on Subject: below --
2005-05-02 6:18 [KJ] [PATCH] i386/apm: use wait_event_interruptible_timeout() Nishanth Aravamudan
2005-05-02 6:18 ` Nishanth Aravamudan
2005-05-03 21:40 ` [KJ] " Nishanth Aravamudan
2005-05-03 21:40 ` Nishanth Aravamudan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.