git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into tracing/hw-breakpoints
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
hw_breakpoint.c
diff --git
a/arch/x86/kernel/hw_breakpoint.c
b/arch/x86/kernel/hw_breakpoint.c
index 69451473dbd2a2abbc95a9833644b4a02043fabc..51d959528b1d9fa4a9924ee65a929c3c12f8d46a 100644
(file)
--- a/
arch/x86/kernel/hw_breakpoint.c
+++ b/
arch/x86/kernel/hw_breakpoint.c
@@
-91,7
+91,7
@@
void arch_update_kernel_hw_breakpoint(void *unused)
*/
kdr7 = temp_kdr7;
set_debugreg(kdr7 | current->thread.debugreg7, 7);
- put_cpu
_no_resched
();
+ put_cpu();
}
/*
@@
-374,7
+374,7
@@
int __kprobes hw_breakpoint_handler(struct die_args *args)
rc = NOTIFY_DONE;
set_debugreg(dr7, 7);
- put_cpu
_no_resched
();
+ put_cpu();
return rc;
}