2005-03-06 22:23:12

by Domen Puncer

Subject: [patch 1/1] kernel/smp: replace schedule_timeout() with ssleep()

Use ssleep() instead of schedule_timeout(). The original code uses
TASK_INTERRUPTIBLE, but does not check for signals, so I believe the change to
ssleep() is appropriate.

Signed-off-by: Nishanth Aravamudan <[email protected]>
Signed-off-by: Domen Puncer <[email protected]>
---


kj-domen/kernel/power/smp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN kernel/power/smp.c~ssleep-kernel_power_smp kernel/power/smp.c
--- kj/kernel/power/smp.c~ssleep-kernel_power_smp 2005-03-05 16:11:19.000000000 +0100
+++ kj-domen/kernel/power/smp.c 2005-03-05 16:11:19.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/interrupt.h>
#include <linux/suspend.h>
#include <linux/module.h>
+#include <linux/delay.h>
#include <asm/atomic.h>
#include <asm/tlbflush.h>

@@ -49,8 +50,7 @@ void disable_nonboot_cpus(void)
printk("Freezing CPUs (at %d)", smp_processor_id());
oldmask = current->cpus_allowed;
set_cpus_allowed(current, cpumask_of_cpu(0));
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ);
+ ssleep(1);
printk("...");
BUG_ON(smp_processor_id() != 0);

_

2005-03-06 22:25:34

by Pavel Machek

Subject: Re: [patch 1/1] kernel/smp: replace schedule_timeout() with ssleep()

Hi!

> Use ssleep() instead of schedule_timeout(). The original code uses
> TASK_INTERRUPTIBLE, but does not check for signals, so I believe the change to
> ssleep() is appropriate.
>
> Signed-off-by: Nishanth Aravamudan <[email protected]>
> Signed-off-by: Domen Puncer <[email protected]>

Actually this code should be rewritten to use cpu hotplug
infrastructure, but this seems simple enough. ACK. [Heh, would be nice
if someone could test it...]

Pavel

> diff -puN kernel/power/smp.c~ssleep-kernel_power_smp kernel/power/smp.c
> --- kj/kernel/power/smp.c~ssleep-kernel_power_smp 2005-03-05 16:11:19.000000000 +0100
> +++ kj-domen/kernel/power/smp.c 2005-03-05 16:11:19.000000000 +0100
> @@ -13,6 +13,7 @@
> #include <linux/interrupt.h>
> #include <linux/suspend.h>
> #include <linux/module.h>
> +#include <linux/delay.h>
> #include <asm/atomic.h>
> #include <asm/tlbflush.h>
>
> @@ -49,8 +50,7 @@ void disable_nonboot_cpus(void)
> printk("Freezing CPUs (at %d)", smp_processor_id());
> oldmask = current->cpus_allowed;
> set_cpus_allowed(current, cpumask_of_cpu(0));
> - current->state = TASK_INTERRUPTIBLE;
> - schedule_timeout(HZ);
> + ssleep(1);
> printk("...");
> BUG_ON(smp_processor_id() != 0);
>
> _

--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!