diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /kernel/kprobes.c | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'kernel/kprobes.c')
| -rw-r--r-- | kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 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); | |||
| 123 | static int __kprobes check_safety(void) | 123 | static int __kprobes check_safety(void) |
| 124 | { | 124 | { |
| 125 | int ret = 0; | 125 | int ret = 0; |
| 126 | #if defined(CONFIG_PREEMPT) && defined(CONFIG_PM) | 126 | #if defined(CONFIG_PREEMPT) && defined(CONFIG_FREEZER) |
| 127 | ret = freeze_processes(); | 127 | ret = freeze_processes(); |
| 128 | if (ret == 0) { | 128 | if (ret == 0) { |
| 129 | struct task_struct *p, *q; | 129 | struct task_struct *p, *q; |