Merge branch 'perf/urgent' into perf/core

Conflicts:
	kernel/events/hw_breakpoint.c

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

diff --cc arch/x86/events/intel/ds.c
Simple merge

diff --cc kernel/events/hw_breakpoint.c
index 6253d5519cd85269cfe5756d2cc3b3a72f063fdc,253ae2da13c38750166299ba265d0b4a6edabf4b..6e28d2866be54afe5ab37d39ccc06f1ee0e8b713
--- 1/kernel/events/hw_breakpoint.c
--- 2/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);

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc kernel/trace/trace_probe.h
Simple merge