diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-16 20:45:34 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-16 20:45:34 +0100 |
| commit | 88d998c264722cd6e8fafa42aee191f7d9194960 (patch) | |
| tree | 72cfd34df16be3e6778ab585c8324e8f5677fe21 /kernel | |
| parent | Merge branch 'thinkpad-acpi' into release (diff) | |
| parent | ACPI: rename main.c to sleep.c (diff) | |
| download | linux-88d998c264722cd6e8fafa42aee191f7d9194960.tar.xz linux-88d998c264722cd6e8fafa42aee191f7d9194960.zip | |
Merge branch 'misc' into release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kprobes.c | 2 | ||||
| -rw-r--r-- | kernel/power/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 1b9cbdc0127a..7ba8cd9845cb 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -123,7 +123,7 @@ static int collect_garbage_slots(void); static int __kprobes check_safety(void) { int ret = 0; -#if defined(CONFIG_PREEMPT) && defined(CONFIG_PM) +#if defined(CONFIG_PREEMPT) && defined(CONFIG_FREEZER) ret = freeze_processes(); if (ret == 0) { struct task_struct *p, *q; diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 597823b5b700..d7a10167a25b 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 |