diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /tools/perf/util/header.h | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/perf/util/header.h')
| -rw-r--r-- | tools/perf/util/header.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index c9fc55cada6d..16a3e83c584e 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h | |||
| @@ -84,7 +84,6 @@ struct perf_session_env { | |||
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | struct perf_header { | 86 | struct perf_header { |
| 87 | int frozen; | ||
| 88 | bool needs_swap; | 87 | bool needs_swap; |
| 89 | s64 attr_offset; | 88 | s64 attr_offset; |
| 90 | u64 data_offset; | 89 | u64 data_offset; |