git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
kprobes.c
diff --git
a/arch/x86/kernel/kprobes.c
b/arch/x86/kernel/kprobes.c
index
b8c6743
..
43c019f
100644
(file)
--- a/
arch/x86/kernel/kprobes.c
+++ b/
arch/x86/kernel/kprobes.c
@@
-860,7
+860,6
@@
static int __kprobes post_kprobe_handler(struct pt_regs *regs)
resume_execution(cur, regs, kcb);
regs->flags |= kcb->kprobe_saved_flags;
- trace_hardirqs_fixup_flags(regs->flags);
if ((kcb->kprobe_status != KPROBE_REENTER) && cur->post_handler) {
kcb->kprobe_status = KPROBE_HIT_SSDONE;