From: Rafael J. Wysocki Fix compilation problems related to the /sys/power/pm_test attribute. Namely, this attribute should also be available when CONFIG_HIBERNATION is set and CONFIG_SUSPEND is unset and it should not break compilation when neither of them is set. Signed-off-by: Rafael J. Wysocki --- kernel/power/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6.24-rc6/kernel/power/main.c =================================================================== --- linux-2.6.24-rc6.orig/kernel/power/main.c +++ linux-2.6.24-rc6/kernel/power/main.c @@ -50,10 +50,6 @@ int pm_notifier_call_chain(unsigned long == NOTIFY_BAD) ? -EINVAL : 0; } -#endif /* CONFIG_PM_SLEEP */ - -#ifdef CONFIG_SUSPEND - #ifdef CONFIG_PM_DEBUG int pm_test_level = TEST_NONE; @@ -127,6 +123,10 @@ power_attr(pm_test); static inline int suspend_test(int level) { return 0; } #endif /* !CONFIG_PM_DEBUG */ +#endif /* CONFIG_PM_SLEEP */ + +#ifdef CONFIG_SUSPEND + /* This is just an arbitrary number */ #define FREE_PAGE_NUMBER (100) @@ -484,7 +484,7 @@ static struct attribute * g[] = { #ifdef CONFIG_PM_TRACE &pm_trace_attr.attr, #endif -#ifdef CONFIG_PM_DEBUG +#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_DEBUG) &pm_test_attr.attr, #endif NULL,