diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:25:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:25:52 -0400 |
| commit | 19504828b4bee5e471bcd35e214bc6fd0d380692 (patch) | |
| tree | 30d4ffb6783daf9fadd47548c035646d3f0f073e /tools/perf/util/include | |
| parent | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (diff) | |
| parent | 3cb6d1540880e767d911b79eb49578de2190f428 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Fix sample size bit operations
perf tools: Fix ommitted mmap data update on remap
watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
watchdog: Disable watchdog when thresh is zero
watchdog: Only disable/enable watchdog if neccessary
watchdog: Fix rounding bug in get_sample_period()
perf tools: Propagate event parse error handling
perf tools: Robustify dynamic sample content fetch
perf tools: Pre-check sample size before parsing
perf tools: Move evlist sample helpers to evlist area
perf tools: Remove junk code in mmap size handling
perf tools: Check we are able to read the event size on mmap
Diffstat (limited to 'tools/perf/util/include')
| -rw-r--r-- | tools/perf/util/include/linux/list.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/list.h b/tools/perf/util/include/linux/list.h index 99358d61e9a5..1d928a0ce997 100644 --- a/tools/perf/util/include/linux/list.h +++ b/tools/perf/util/include/linux/list.h | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/prefetch.h> | ||
| 3 | |||
| 2 | #include "../../../../include/linux/list.h" | 4 | #include "../../../../include/linux/list.h" |
| 3 | 5 | ||
| 4 | #ifndef PERF_LIST_H | 6 | #ifndef PERF_LIST_H |