projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
4515889
)
Merge branch 'linus' into x86/kprobes
author
Ingo Molnar
<mingo@elte.hu>
Wed, 16 Jul 2008 11:11:29 +0000
(13:11 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 16 Jul 2008 11:11:29 +0000
(13:11 +0200)
arch/x86/kernel/kprobes.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/kernel/kprobes.c
b/arch/x86/kernel/kprobes.c
index b8c6743a13daddad0446d686d3f36436b3ac7531..43c019f85f0db749425e451957bd2279cee47b80 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;