Re: Linux 2.4.19pre5-ac3

[Pavel Machek <pavel@suse.cz>]

Hi!

> > > > Linux 2.4.19pre5-ac3
> > > > o	Software suspend initial patch 		(Pavel Machek, Gabor Kuti,..)
> > > > 	| Don't enable this idly. Its here to get exposure and so
> > > > 	| people can bring the rest of the code up to meet its needs as
> > > > 	| well as fix it.
> > > > 	| Read the docs first!
> > > 
> > > Didn't enable software suspend, but I do use ACPI...
> > 
> > Looks like we need some #ifdefs in acpi... I'll fix that.
> 
> 10 minutes ago emailed to alan with following:

S4 is not supported in current ACPI, so you should better make it
printk("s4 not supported") and do nothing instead of entering ACPI-S4
and powering system down when user wants "only" suspend. 

> diff -Nru a/drivers/acpi/ospm/system/sm_osl.c b/drivers/acpi/ospm/system/sm_osl.c
> --- a/drivers/acpi/ospm/system/sm_osl.c	Wed Apr 10 00:03:00 2002
> +++ b/drivers/acpi/ospm/system/sm_osl.c	Wed Apr 10 00:03:00 2002
> @@ -140,10 +140,14 @@
>  	if (system->states[value] != TRUE)
>  		return -EINVAL;
>  	
> +#ifdef CONFIG_SOFTWARE_SUSPEND
>  	if (value != ACPI_S4)
> +#endif
>  		sm_osl_suspend(value);
> +#ifdef CONFIG_SOFTWARE_SUSPEND
>  	else
>  		software_suspend();
> +#endif
>  	
>  	return (count);
>  }

Kill first ifdef and replace second one with something like

	else
#ifdef CONFIG_....
		software_suspend();
#else
		printk("You need .... for S4.");
#endif
							Pavel
-- 
Casualities in World Trade Center: ~3k dead inside the building,
cryptography in U.S.A. and free speech in Czech Republic.