| From 7089d03dd9df82aa9f6f08743eeadad0aa682b53 Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rjw@sisk.pl> |
| Date: Sat, 14 Jan 2012 00:33:03 +0100 |
| Subject: PM: Make sysrq-o be available for CONFIG_PM unset |
| |
| After commit 1eb208aea3179dd2fc0cdeea45ef869d75b4fe70, "PM: Make |
| CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)", the |
| files under kernel/power are not built unless CONFIG_PM_SLEEP or |
| CONFIG_PM_RUNTIME is set. In particular, this causes |
| kernel/power/poweroff.c to be omitted, even though it should be |
| compiled, because CONFIG_MAGIC_SYSRQ is set. |
| |
| Fix the problem by causing kernel/power/Makefile to be processed |
| for CONFIG_PM unset too. |
| |
| Reported-and-tested-by: Phil Oester <kernel@linuxace.com> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit dae5cbc2440b1d21a15715d0f1fb20f632dd38ee) |
| |
| Conflicts: |
| |
| kernel/Makefile |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| kernel/Makefile | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/kernel/Makefile b/kernel/Makefile |
| index de5198f..856f9d6 100644 |
| --- a/kernel/Makefile |
| +++ b/kernel/Makefile |
| @@ -24,6 +24,8 @@ CFLAGS_REMOVE_sched_clock.o = -pg |
| CFLAGS_REMOVE_irq_work.o = -pg |
| endif |
| |
| +obj-y += power/ |
| + |
| obj-$(CONFIG_FREEZER) += freezer.o |
| obj-$(CONFIG_PROFILING) += profile.o |
| obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o |
| @@ -52,8 +54,6 @@ obj-$(CONFIG_PROVE_LOCKING) += spinlock.o |
| 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 |
| -- |
| 1.7.10.1.362.g242cab3 |
| |