2002-11-13 20:35:02

by Petr Vandrovec

[permalink] [raw]
Subject: Re: swsusp for 2.5.47 [not for inclusion]

On 12 Nov 02 at 22:51, Pavel Machek wrote:

> This is patch I'm using. With this swsusp in 2.5.47 should work.
>
> --- clean/arch/i386/kernel/Makefile 2002-11-12 18:40:26.000000000 +0100
> +++ linux-swsusp/arch/i386/kernel/Makefile 2002-11-12 22:22:53.000000000 +0100
> @@ -24,7 +24,7 @@
> obj-$(CONFIG_X86_MPPARSE) += mpparse.o
> obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
> obj-$(CONFIG_X86_IO_APIC) += io_apic.o
> -obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
> +obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o suspend_asm.o
> obj-$(CONFIG_X86_NUMAQ) += numaq.o
> obj-$(CONFIG_PROFILING) += profile.o
> obj-$(CONFIG_EDD) += edd.o

With 2.5.47-bk-current, your patch is apparently included.

I had to modify this Makefile (in 2.5.47-bk) to include suspend.o
unconditionally because of saved_* is declared here, and they are
needed by ACPI. Of course, it is also possible to do

obj-$(CONFIG_ACPI_SLEEP) += acpi_wakeup.o suspend.o

instead of linking suspend.o unconditionally, but I did not tested it.
Best regards,
Petr Vandrovec
[email protected]


2002-11-13 20:50:38

by Pavel Machek

[permalink] [raw]
Subject: Re: swsusp for 2.5.47 [not for inclusion]

Hi!

> > This is patch I'm using. With this swsusp in 2.5.47 should work.
> >
> > --- clean/arch/i386/kernel/Makefile 2002-11-12 18:40:26.000000000 +0100
> > +++ linux-swsusp/arch/i386/kernel/Makefile 2002-11-12 22:22:53.000000000 +0100
> > @@ -24,7 +24,7 @@
> > obj-$(CONFIG_X86_MPPARSE) += mpparse.o
> > obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
> > obj-$(CONFIG_X86_IO_APIC) += io_apic.o
> > -obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
> > +obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o suspend_asm.o
> > obj-$(CONFIG_X86_NUMAQ) += numaq.o
> > obj-$(CONFIG_PROFILING) += profile.o
> > obj-$(CONFIG_EDD) += edd.o
>
> With 2.5.47-bk-current, your patch is apparently included.

Thanx for info.

> I had to modify this Makefile (in 2.5.47-bk) to include suspend.o
> unconditionally because of saved_* is declared here, and they are
> needed by ACPI. Of course, it is also possible to do
>
> obj-$(CONFIG_ACPI_SLEEP) += acpi_wakeup.o suspend.o

Uff. Right. I'll have to deal with that somehow. Thanx.

...

...

CONFIG_ACPI_SLEEP should imply CONFIG_SOFTWARE_SUSPEND is
enabled. I'll have to check those configs...
Pavel
--
Casualities in World Trade Center: ~3k dead inside the building,
cryptography in U.S.A. and free speech in Czech Republic.