Re: Re: fix ACPI poweroff in 2.4.25-rc2

[Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]

On Wed, 2004-03-03 at 15:05, Bjorn Helgaas wrote:
> On Wednesday 03 March 2004 12:46 pm, Matthew Wilcox wrote:
> > On Wed, Mar 03, 2004 at 11:17:25AM -0700, Bjorn Helgaas wrote:

> Here's a patch to do it that way, if you prefer.  acpi_system_save_state()
> isn't defined before use, so you get a warning about that, which I didn't
> bother to fix (I expect x86 probably sees the same warning).

I think you mean this, yes?
(note that CONFIG_X86 was redundant since CONFIG_ACPI_SLEEP depends on
it)

-Len

===== drivers/acpi/system.c 1.16 vs edited =====
--- 1.16/drivers/acpi/system.c	Sun Feb 15 06:38:17 2004
+++ edited/drivers/acpi/system.c	Sat Mar  6 00:57:18 2004
@@ -41,14 +41,18 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-#ifdef CONFIG_X86
 #ifdef CONFIG_ACPI_SLEEP
 #include <linux/mc146818rtc.h>
 #include <linux/irq.h>
 #include <asm/hw_irq.h>
-#endif
-#endif
 
+acpi_status acpi_system_save_state(u32);
+#else
+static inline acpi_status acpi_system_save_state(u32 state)
+{
+	return AE_OK;
+}
+#endif /* !CONFIG_ACPI_SLEEP */
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME		("acpi_system")





-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click