git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[safe/jmp/linux-2.6]
/
kernel
/
kprobes.c
diff --git
a/kernel/kprobes.c
b/kernel/kprobes.c
index
1b9cbdc
..
7ba8cd9
100644
(file)
--- 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;