From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 29 Mar 2018 14:03:48 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v4.17-rc1~179^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2d074918fb1568f398777343ff9a28049fb86337;p=uclinux-h8%2Flinux.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	kernel/events/hw_breakpoint.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

2d074918fb1568f398777343ff9a28049fb86337
diff --cc kernel/events/hw_breakpoint.c
index 6253d5519cd8,253ae2da13c3..6e28d2866be5
--- a/kernel/events/hw_breakpoint.c
+++ b/kernel/events/hw_breakpoint.c
@@@ -510,17 -441,21 +506,14 @@@ int modify_user_hw_breakpoint(struct pe
  	else
  		perf_event_disable(bp);
  
- 	err = modify_user_hw_breakpoint_check(bp, attr, false);
 -	bp->attr.bp_addr = attr->bp_addr;
 -	bp->attr.bp_type = attr->bp_type;
 -	bp->attr.bp_len = attr->bp_len;
 -	bp->attr.disabled = 1;
--
- 	if (err) {
- 		if (!bp->attr.disabled)
- 			perf_event_enable(bp);
+ 	if (!attr->disabled) {
 -		int err = validate_hw_breakpoint(bp);
++		int err = modify_user_hw_breakpoint_check(bp, attr, false);
  
- 		return err;
- 	}
- 
- 	if (!attr->disabled)
+ 		if (err)
+ 			return err;
 -
  		perf_event_enable(bp);
+ 		bp->attr.disabled = 0;
+ 	}
 -
  	return 0;
  }
  EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);