Messages in this thread Patch in this message | | | From | "Rafael J. Wysocki" <> | Subject | [Resend][PATCH 6/9] PM: Fix compilation of suspend code if CONFIG_PM is unset | Date | Tue, 17 Jul 2007 22:45:48 +0200 |
| |
From: Rafael J. Wysocki <rjw@sisk.pl>
Some platforms, particualrly in the ARM tree, require that suspend_set_ops() and pm_suspend() be defined even if CONFIG_PM is not set. Make this requirement be satisfied.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@ucw.cz> --- include/linux/suspend.h | 7 +++++++ 1 file changed, 7 insertions(+)
Index: linux-2.6.22-git5/include/linux/suspend.h =================================================================== --- linux-2.6.22-git5.orig/include/linux/suspend.h +++ linux-2.6.22-git5/include/linux/suspend.h @@ -79,6 +79,7 @@ struct platform_suspend_ops { extern struct platform_suspend_ops *suspend_ops; +#ifdef CONFIG_PM /** * suspend_set_ops - set platform dependent suspend operations * @ops: The new suspend operations to set. @@ -105,6 +106,12 @@ extern void arch_suspend_disable_irqs(vo extern void arch_suspend_enable_irqs(void); extern int pm_suspend(suspend_state_t state); +#else /* CONFIG_PM */ +#define suspend_valid_only_mem NULL + +static inline void suspend_set_ops(struct platform_suspend_ops *ops) {} +static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } +#endif /* CONFIG_PM */ /* struct pbe is used for creating lists of pages that should be restored * atomically during the resume from disk, because the page frames they have - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |