projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
hw_breakpoint.c
diff --git
a/arch/powerpc/kernel/hw_breakpoint.c
b/arch/powerpc/kernel/hw_breakpoint.c
index
9781c69
..
03d089b
100644
(file)
--- a/
arch/powerpc/kernel/hw_breakpoint.c
+++ b/
arch/powerpc/kernel/hw_breakpoint.c
@@
-275,7
+275,7
@@
int hw_breakpoint_handler(struct die_args *args)
if (!stepped) {
WARN(1, "Unable to handle hardware breakpoint. Breakpoint at "
"0x%lx will be disabled.", info->address);
- perf_event_disable(bp);
+ perf_event_disable
_inatomic
(bp);
goto out;
}
/*