On Thursday, 13 of December 2007, [EMAIL PROTECTED] wrote:
>
> The patch titled
> git-acpi build fix
> has been added to the -mm tree. Its filename is
> git-acpi-build-fix.patch
>
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
> See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
> out what to do about this
>
> ------------------------------------------------------
> Subject: git-acpi build fix
> From: Andrew Morton <[EMAIL PROTECTED]>
>
> ia64 allmodconfig:
>
> kernel/power/main.c:493: error: `pm_test_attr' undeclared here (not in a
> function)
>
> Cc: Len Brown <[EMAIL PROTECTED]>
> Cc: "Rafael J. Wysocki" <[EMAIL PROTECTED]>
> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
> ---
>
> kernel/power/main.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff -puN kernel/power/main.c~git-acpi-build-fix kernel/power/main.c
> --- a/kernel/power/main.c~git-acpi-build-fix
> +++ a/kernel/power/main.c
> @@ -489,9 +489,6 @@ static struct attribute * g[] = {
> #ifdef CONFIG_PM_TRACE
> &pm_trace_attr.attr,
> #endif
> -#ifdef CONFIG_PM_DEBUG
> - &pm_test_attr.attr,
> -#endif
Doesn't it kill pm_test_attr on all architectures?
The proper (hopefully) fix is appended (Len, please add it to the suspend
branch).
---
From: Rafael J. Wysocki <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
---
kernel/power/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6/kernel/power/main.c
===================================================================
--- linux-2.6.orig/kernel/power/main.c
+++ linux-2.6/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,
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
