diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /tools/perf/util/pstack.h | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/perf/util/pstack.h')
| -rw-r--r-- | tools/perf/util/pstack.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/pstack.h b/tools/perf/util/pstack.h index 5ad07023504b..4cedea59f518 100644 --- a/tools/perf/util/pstack.h +++ b/tools/perf/util/pstack.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _PERF_PSTACK_ | 1 | #ifndef _PERF_PSTACK_ |
| 2 | #define _PERF_PSTACK_ | 2 | #define _PERF_PSTACK_ |
| 3 | 3 | ||
| 4 | #include <stdbool.h> | ||
| 5 | |||
| 4 | struct pstack; | 6 | struct pstack; |
| 5 | struct pstack *pstack__new(unsigned short max_nr_entries); | 7 | struct pstack *pstack__new(unsigned short max_nr_entries); |
| 6 | void pstack__delete(struct pstack *self); | 8 | void pstack__delete(struct pstack *self); |