PM: Fix freezer compilation if PM_SLEEP is unset

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Friday, January 16, 2009 - 1:59 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=33f1d7...
Commit:     33f1d7ecc6cffff3c618a02295de969ebbacd95d
Parent:     c59765042f53a79a7a65585042ff463b69cb248c
Author:     Rafael J. Wysocki <rjw@sisk.pl>
AuthorDate: Tue Jan 6 21:14:04 2009 +0100
Committer:  Len Brown <len.brown@intel.com>
CommitDate: Fri Jan 16 14:32:17 2009 -0500

    PM: Fix freezer compilation if PM_SLEEP is unset
    
    Freezer fails to compile if with the following configuration
    settings:
    
    CONFIG_CGROUPS=y
    CONFIG_CGROUP_FREEZER=y
    CONFIG_MODULES=y
    CONFIG_FREEZER=y
    CONFIG_PM=y
    CONFIG_PM_SLEEP=n
    
    Fix this by making process.o compilation depend on CONFIG_FREEZER.
    
    Reported-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Len Brown <len.brown@intel.com>
---
 kernel/power/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 597823b..d7a1016 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -4,7 +4,8 @@ EXTRA_CFLAGS	+=	-DDEBUG
 endif
 
 obj-y				:= main.o
-obj-$(CONFIG_PM_SLEEP)		+= process.o console.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
 
 obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
PM: Fix freezer compilation if PM_SLEEP is unset, Linux Kernel Mailing ..., (Fri Jan 16, 1:59 pm)