The patch titled
Export pm_suspend for the shared APM emulation
has been added to the -mm tree. Its filename is
export-pm_suspend-for-the-shared-apm-emulation.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Export pm_suspend for the shared APM emulation
From: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
The new shared APM emulation just like its ARM and MIPS predecessors uses
pm_suspend() which was only exported on SH. Move export to close to it's
definition where it really should be anyway.
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/sh/kernel/sh_ksyms.c | 4 ----
kernel/power/main.c | 3 ++-
2 files changed, 2 insertions(+), 5 deletions(-)
diff -puN arch/sh/kernel/sh_ksyms.c~export-pm_suspend-for-the-shared-apm-emulation arch/sh/kernel/sh_ksyms.c
--- a/arch/sh/kernel/sh_ksyms.c~export-pm_suspend-for-the-shared-apm-emulation
+++ a/arch/sh/kernel/sh_ksyms.c
@@ -102,10 +102,6 @@ EXPORT_SYMBOL(__down_trylock);
EXPORT_SYMBOL(synchronize_irq);
#endif
-#ifdef CONFIG_PM
-EXPORT_SYMBOL(pm_suspend);
-#endif
-
EXPORT_SYMBOL(csum_partial);
#ifdef CONFIG_IPV6
EXPORT_SYMBOL(csum_ipv6_magic);
diff -puN kernel/power/main.c~export-pm_suspend-for-the-shared-apm-emulation kernel/power/main.c
--- a/kernel/power/main.c~export-pm_suspend-for-the-shared-apm-emulation
+++ a/kernel/power/main.c
@@ -8,6 +8,7 @@
*
*/
+#include <linux/module.h>
#include <linux/suspend.h>
#include <linux/kobject.h>
#include <linux/string.h>
@@ -229,7 +230,7 @@ int pm_suspend(suspend_state_t state)
return -EINVAL;
}
-
+EXPORT_SYMBOL(pm_suspend);
decl_subsys(power,NULL,NULL);
_
Patches currently in -mm which might be from ralf@xxxxxxxxxxxxxx are
make-linux-personalityh-userspace-proof.patch
add-shared-version-of-apm-emulation.patch
arm-convert-to-use-shared-apm-emulation.patch
mips-convert-to-use-shared-apm-emulation.patch
export-pm_suspend-for-the-shared-apm-emulation.patch
generic-ioremap_page_range-mips-conversion.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
