The patch titled
pm: fix build for CONFIG_PM unset
has been added to the -mm tree. Its filename is
pm-fix-build-for-config_pm-unset.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pm: fix build for CONFIG_PM unset
From: Rafael J. Wysocki <rjw@xxxxxxx>
Compilation of kprobes.c with CONFIG_PM unset is broken due to some broken
config dependncies. Fix that.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Reported-by: Ingo Molnar <mingo@xxxxxxx>
Tested-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/Makefile | 1 +
kernel/power/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN kernel/Makefile~pm-fix-build-for-config_pm-unset kernel/Makefile
--- a/kernel/Makefile~pm-fix-build-for-config_pm-unset
+++ a/kernel/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_UID16) += uid16.o
obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_KALLSYMS) += kallsyms.o
obj-$(CONFIG_PM) += power/
+obj-$(CONFIG_FREEZER) += power/
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
obj-$(CONFIG_KEXEC) += kexec.o
obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o
diff -puN kernel/power/Makefile~pm-fix-build-for-config_pm-unset kernel/power/Makefile
--- a/kernel/power/Makefile~pm-fix-build-for-config_pm-unset
+++ a/kernel/power/Makefile
@@ -3,7 +3,7 @@ ifeq ($(CONFIG_PM_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
endif
-obj-y := main.o
+obj-$(CONFIG_PM) += main.o
obj-$(CONFIG_PM_SLEEP) += console.o
obj-$(CONFIG_FREEZER) += process.o
obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o
_
Patches currently in -mm which might be from rjw@xxxxxxx are
linux-next.patch
drivers-consolidate-driver_probe_done-loops-into-one-place.patch
resume-wait-for-device-probing-to-finish.patch
pm-fix-build-for-config_pm-unset.patch
aty128fb-properly-save-pci-state-before-changing-pci-pm-level-fix.patch
swsusp-clean-up-shrink_all_zones.patch
swsusp-dont-fiddle-with-swappiness.patch
pm-wait-for-console-in-resume.patch
pm-fix-suspend_console-resume_console-to-use-only-one-semaphore.patch
fix-pm_notifiers-during-user-mode-hibernation.patch
shrink_slab-handle-bad-shrinkers.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
