* [KJ] Re: [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with
2005-05-19 6:25 ` Nishanth Aravamudan
@ 2005-05-19 6:25 ` Evgeniy Polyakov
-1 siblings, 0 replies; 6+ messages in thread
From: Evgeniy Polyakov @ 2005-01-21 22:17 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
> Hi,
> Please consider applying.
> Description: Use msleep_interruptible() instead of schedule_timeout() to
> guarantee the task delays as expected. Changed tm to an int, as it now is in
> terms of msecs, not jiffies.
I've applied it to my tree, thank you.
Greg please push it upstream.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
--- 2.6.11-rc1-kj-v/drivers/w1/w1_therm.c 2005-01-15 16:55:44.000000000 -0800
+++ 2.6.11-rc1-kj/drivers/w1/w1_therm.c 2005-01-21 13:41:08.000000000 -0800
@@ -26,6 +26,7 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/types.h>
+#include <linux/delay.h>
#include "w1.h"
#include "w1_io.h"
@@ -128,7 +129,7 @@ static ssize_t w1_therm_read_bin(struct
if (!w1_reset_bus (dev)) {
int count = 0;
u8 match[9] = {W1_MATCH_ROM, };
- unsigned long tm;
+ unsigned int tm = 750;
memcpy(&match[1], (u64 *) & sl->reg_num, 8);
@@ -136,11 +137,8 @@ static ssize_t w1_therm_read_bin(struct
w1_write_8(dev, W1_CONVERT_TEMP);
- tm = jiffies + msecs_to_jiffies(750);
- while(time_before(jiffies, tm)) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(tm-jiffies);
-
+ while (tm) {
+ tm = msleep_interruptible(tm);
if (signal_pending(current))
flush_signals(current);
}
Evgeniy Polyakov
Only failure makes us experts. -- Theo de Raadt
[-- 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] 6+ messages in thread* [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with
@ 2005-05-19 6:25 ` Evgeniy Polyakov
0 siblings, 0 replies; 6+ messages in thread
From: Evgeniy Polyakov @ 2005-05-19 6:25 UTC (permalink / raw)
To: kernel-janitors
> Hi,
> Please consider applying.
> Description: Use msleep_interruptible() instead of schedule_timeout() to
> guarantee the task delays as expected. Changed tm to an int, as it now is in
> terms of msecs, not jiffies.
I've applied it to my tree, thank you.
Greg please push it upstream.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
--- 2.6.11-rc1-kj-v/drivers/w1/w1_therm.c 2005-01-15 16:55:44.000000000 -0800
+++ 2.6.11-rc1-kj/drivers/w1/w1_therm.c 2005-01-21 13:41:08.000000000 -0800
@@ -26,6 +26,7 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/types.h>
+#include <linux/delay.h>
#include "w1.h"
#include "w1_io.h"
@@ -128,7 +129,7 @@ static ssize_t w1_therm_read_bin(struct
if (!w1_reset_bus (dev)) {
int count = 0;
u8 match[9] = {W1_MATCH_ROM, };
- unsigned long tm;
+ unsigned int tm = 750;
memcpy(&match[1], (u64 *) & sl->reg_num, 8);
@@ -136,11 +137,8 @@ static ssize_t w1_therm_read_bin(struct
w1_write_8(dev, W1_CONVERT_TEMP);
- tm = jiffies + msecs_to_jiffies(750);
- while(time_before(jiffies, tm)) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(tm-jiffies);
-
+ while (tm) {
+ tm = msleep_interruptible(tm);
if (signal_pending(current))
flush_signals(current);
}
Evgeniy Polyakov
Only failure makes us experts. -- Theo de Raadt
^ permalink raw reply [flat|nested] 6+ messages in thread* [KJ] Re: [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with
2005-05-19 6:25 ` Evgeniy Polyakov
@ 2005-05-19 6:25 ` Greg KH
-1 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2005-01-25 6:27 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
On Sat, Jan 22, 2005 at 01:17:46AM +0300, Evgeniy Polyakov wrote:
> > Hi,
>
> > Please consider applying.
>
> > Description: Use msleep_interruptible() instead of schedule_timeout() to
> > guarantee the task delays as expected. Changed tm to an int, as it now is in
> > terms of msecs, not jiffies.
>
> I've applied it to my tree, thank you.
>
> Greg please push it upstream.
>
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Applied, thanks.
greg k-h
[-- 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] 6+ messages in thread
* [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with
@ 2005-05-19 6:25 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2005-05-19 6:25 UTC (permalink / raw)
To: kernel-janitors
On Sat, Jan 22, 2005 at 01:17:46AM +0300, Evgeniy Polyakov wrote:
> > Hi,
>
> > Please consider applying.
>
> > Description: Use msleep_interruptible() instead of schedule_timeout() to
> > guarantee the task delays as expected. Changed tm to an int, as it now is in
> > terms of msecs, not jiffies.
>
> I've applied it to my tree, thank you.
>
> Greg please push it upstream.
>
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [KJ] [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with
@ 2005-05-19 6:25 ` Nishanth Aravamudan
0 siblings, 0 replies; 6+ messages in thread
From: Nishanth Aravamudan @ 2005-01-21 21:43 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]
Hi,
Please consider applying.
Description: Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected. Changed tm to an int, as it now is in
terms of msecs, not jiffies.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-rc1-kj-v/drivers/w1/w1_therm.c 2005-01-15 16:55:44.000000000 -0800
+++ 2.6.11-rc1-kj/drivers/w1/w1_therm.c 2005-01-21 13:41:08.000000000 -0800
@@ -26,6 +26,7 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/types.h>
+#include <linux/delay.h>
#include "w1.h"
#include "w1_io.h"
@@ -128,7 +129,7 @@ static ssize_t w1_therm_read_bin(struct
if (!w1_reset_bus (dev)) {
int count = 0;
u8 match[9] = {W1_MATCH_ROM, };
- unsigned long tm;
+ unsigned int tm = 750;
memcpy(&match[1], (u64 *) & sl->reg_num, 8);
@@ -136,11 +137,8 @@ static ssize_t w1_therm_read_bin(struct
w1_write_8(dev, W1_CONVERT_TEMP);
- tm = jiffies + msecs_to_jiffies(750);
- while(time_before(jiffies, tm)) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(tm-jiffies);
-
+ while (tm) {
+ tm = msleep_interruptible(tm);
if (signal_pending(current))
flush_signals(current);
}
[-- 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] 6+ messages in thread* [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with
@ 2005-05-19 6:25 ` Nishanth Aravamudan
0 siblings, 0 replies; 6+ messages in thread
From: Nishanth Aravamudan @ 2005-05-19 6:25 UTC (permalink / raw)
To: kernel-janitors
Hi,
Please consider applying.
Description: Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected. Changed tm to an int, as it now is in
terms of msecs, not jiffies.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-rc1-kj-v/drivers/w1/w1_therm.c 2005-01-15 16:55:44.000000000 -0800
+++ 2.6.11-rc1-kj/drivers/w1/w1_therm.c 2005-01-21 13:41:08.000000000 -0800
@@ -26,6 +26,7 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/types.h>
+#include <linux/delay.h>
#include "w1.h"
#include "w1_io.h"
@@ -128,7 +129,7 @@ static ssize_t w1_therm_read_bin(struct
if (!w1_reset_bus (dev)) {
int count = 0;
u8 match[9] = {W1_MATCH_ROM, };
- unsigned long tm;
+ unsigned int tm = 750;
memcpy(&match[1], (u64 *) & sl->reg_num, 8);
@@ -136,11 +137,8 @@ static ssize_t w1_therm_read_bin(struct
w1_write_8(dev, W1_CONVERT_TEMP);
- tm = jiffies + msecs_to_jiffies(750);
- while(time_before(jiffies, tm)) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(tm-jiffies);
-
+ while (tm) {
+ tm = msleep_interruptible(tm);
if (signal_pending(current))
flush_signals(current);
}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2005-05-19 6:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-01-21 22:17 [KJ] Re: [PATCH 39/39] w1/w1_therm: replace schedule_timeout() with Evgeniy Polyakov
2005-05-19 6:25 ` Evgeniy Polyakov
2005-01-25 6:27 ` [KJ] " Greg KH
2005-05-19 6:25 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2005-01-21 21:43 [KJ] " Nishanth Aravamudan
2005-05-19 6:25 ` 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.