Commit 6dcf6a4e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Ingo Molnar:
 "Fix an initialization bug in the hw-breakpoints, which triggered on
  the ARM platform"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization
parents 95779fe8 310aa0a2
...@@ -413,7 +413,7 @@ static int hw_breakpoint_parse(struct perf_event *bp, ...@@ -413,7 +413,7 @@ static int hw_breakpoint_parse(struct perf_event *bp,
int register_perf_hw_breakpoint(struct perf_event *bp) int register_perf_hw_breakpoint(struct perf_event *bp)
{ {
struct arch_hw_breakpoint hw; struct arch_hw_breakpoint hw = { };
int err; int err;
err = reserve_bp_slot(bp); err = reserve_bp_slot(bp);
...@@ -461,7 +461,7 @@ int ...@@ -461,7 +461,7 @@ int
modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *attr, modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *attr,
bool check) bool check)
{ {
struct arch_hw_breakpoint hw; struct arch_hw_breakpoint hw = { };
int err; int err;
err = hw_breakpoint_parse(bp, attr, &hw); err = hw_breakpoint_parse(bp, attr, &hw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment