[PATCH] fix platforms without suspend

[PATCH] fix platforms without suspend

[Paul Mackerras]

At the moment, any architecture that doesn't have <asm/suspend.h>
won't compile.  The patch below changes <linux/suspend.h> so it only
looks for <asm/suspend.h> if CONFIG_SOFTWARE_SUSPEND is set.

Linus, it would be good if you would apply this to your tree so that
architectures other than i386 will compile.

Thanks,
Paul.

diff -urN linux-2.5/include/linux/suspend.h pmac-2.5/include/linux/suspend.h
--- linux-2.5/include/linux/suspend.h	Thu May 23 12:02:19 2002
+++ pmac-2.5/include/linux/suspend.h	Sat May 25 10:54:02 2002
@@ -1,17 +1,18 @@
 #ifndef _LINUX_SWSUSP_H
 #define _LINUX_SWSUSP_H
 
-#include <asm/suspend.h>
+#include <linux/config.h>
 #include <linux/swap.h>
 #include <linux/notifier.h>
-#include <linux/config.h>
+
+#ifdef CONFIG_SOFTWARE_SUSPEND
+#include <asm/suspend.h>
 
 extern unsigned char software_suspend_enabled;
 
 #define NORESUME	 1
 #define RESUME_SPECIFIED 2
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
 /* page backup entry */
 typedef struct pbe {
 	unsigned long address;		/* address of the copy */

Re: [PATCH] fix platforms without suspend

[Pavel Machek]

Hi!

> At the moment, any architecture that doesn't have <asm/suspend.h>
> won't compile.  The patch below changes <linux/suspend.h> so it only
> looks for <asm/suspend.h> if CONFIG_SOFTWARE_SUSPEND is set.
> 
> Linus, it would be good if you would apply this to your tree so that
> architectures other than i386 will compile.

This is wrong, because suspend-to-RAM also needs asm/suspend.h, and already
fixed the right way in the main tree.
									Pavel

-- 
Philips Velo 1: 1"x4"x8", 300gram, 60, 12MB, 40bogomips, linux, mutt,
details at http://atrey.karlin.mff.cuni.cz/~pavel/velo/index.html.