diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-06 17:00:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 17:22:57 +0200 |
| commit | ff1f74fdcf1881b6c008463c34e9e2a93abe117a (patch) | |
| tree | 234f3bd33f6e6a74943be59211400a53da8d14bf /include | |
| parent | 212d95dfdb66e5c81879b08e4f7fbfc8498b1ab5 (diff) | |
| parent | db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72 (diff) | |
Merge branch 'perf/urgent' into perf/core
Eliminate a conflict in a patch I am going to apply.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 1817d4015e5f..45db49f64bb4 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -555,7 +555,7 @@ enum perf_event_type { PERF_RECORD_MAX, /* non-ABI */ }; -#define PERF_MAX_STACK_DEPTH 255 +#define PERF_MAX_STACK_DEPTH 127 enum perf_callchain_context { PERF_CONTEXT_HV = (__u64)-32, |