Merge branch 'perf/hw_breakpoints' into perf/core

The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.

Conflicts:
	tools/perf/Documentation/perf-record.txt

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

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/include/uapi/asm/msr-index.h
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc tools/perf/Documentation/perf-record.txt
index 7d8df2e,81a20f2..31e9774
--- 1/tools/perf/Documentation/perf-record.txt
--- 2/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@@ -33,24 -33,15 +33,27 @@@ OPTION
          - a raw PMU event (eventsel+umask) in the form of rNNN where NNN is a
          hexadecimal event descriptor.
  
-         - a hardware breakpoint event in the form of '\mem:addr[:access]'
 +      - a symbolically formed PMU event like 'pmu/param1=0x3,param2/' where
 +        'param1', 'param2', etc are defined as formats for the PMU in
 +        /sys/bus/event_sources/devices/<pmu>/format/*.
 +
 +      - a symbolically formed event like 'pmu/config=M,config1=N,config3=K/'
 +
 +          where M, N, K are numbers (in decimal, hex, octal format). Acceptable
 +          values for each of 'config', 'config1' and 'config2' are defined by
 +          corresponding entries in /sys/bus/event_sources/devices/<pmu>/format/*
 +          param1 and param2 are defined as formats for the PMU in:
 +          /sys/bus/event_sources/devices/<pmu>/format/*
 +
+         - a hardware breakpoint event in the form of '\mem:addr[/len][:access]'
            where addr is the address in memory you want to break in.
            Access is the memory access type (read, write, execute) it can
-           be passed as follows: '\mem:addr[:[r][w][x]]'.
+           be passed as follows: '\mem:addr[:[r][w][x]]'. len is the range,
+           number of bytes from specified addr, which the breakpoint will cover.
            If you want to profile read-write accesses in 0x1000, just set
            'mem:0x1000:rw'.
+           If you want to profile write accesses in [0x1000~1008), just set
+           'mem:0x1000/8:w'.
  
  --filter=<filter>::
          Event filter.

diff --cc tools/perf/tests/parse-events.c
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

diff --cc tools/perf/util/parse-events.h
Simple merge