tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Rafael J. Wysocki and committed by
Linus Torvalds 09664fda a1bb7d61

+2 -1
unified split
+1
kernel/Makefile
··· 51 obj-$(CONFIG_MODULES) += module.o 52 obj-$(CONFIG_KALLSYMS) += kallsyms.o 53 obj-$(CONFIG_PM) += power/ 54 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o 55 obj-$(CONFIG_KEXEC) += kexec.o 56 obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o
··· 51 obj-$(CONFIG_MODULES) += module.o 52 obj-$(CONFIG_KALLSYMS) += kallsyms.o 53 obj-$(CONFIG_PM) += power/ 54 + obj-$(CONFIG_FREEZER) += power/ 55 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o 56 obj-$(CONFIG_KEXEC) += kexec.o 57 obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o
+1 -1
kernel/power/Makefile
··· 3 EXTRA_CFLAGS += -DDEBUG 4 endif 5 6 - obj-y := main.o 7 obj-$(CONFIG_PM_SLEEP) += console.o 8 obj-$(CONFIG_FREEZER) += process.o 9 obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o
··· 3 EXTRA_CFLAGS += -DDEBUG 4 endif 5 6 + obj-$(CONFIG_PM) += main.o 7 obj-$(CONFIG_PM_SLEEP) += console.o 8 obj-$(CONFIG_FREEZER) += process.o 9 obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o