projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
avr32
/
kernel
/
kprobes.c
diff --git
a/arch/avr32/kernel/kprobes.c
b/arch/avr32/kernel/kprobes.c
index ca41fc1edbe1aa26711343a3fcae488899de7882..004c94b6fc1d62ba9c8aa20bcfaa8591da9c5a0b 100644
(file)
--- a/
arch/avr32/kernel/kprobes.c
+++ b/
arch/avr32/kernel/kprobes.c
@@
-15,7
+15,7
@@
#include <linux/ptrace.h>
#include <asm/cacheflush.h>
-#include <
asm
/kdebug.h>
+#include <
linux
/kdebug.h>
#include <asm/ocd.h>
DEFINE_PER_CPU(struct kprobe *, current_kprobe);
@@
-154,6
+154,7
@@
ss_probe:
return 1;
no_kprobe:
+ preempt_enable_no_resched();
return ret;
}