Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09664fda authored Feb 14, 2009 by Rafael J. Wysocki Committed by Linus Torvalds Feb 21, 2009

PM: fix build for CONFIG_PM unset

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@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <gregkh@suse.de>
Reported-by: Ingo Molnar <mingo@elte.hu>
Tested-by: Masami Hiramatsu <mhiramat@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a1bb7d61

kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

kernel/power/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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