diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:58:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:58:04 +1100 |
| commit | 7f1546329db7b573f3a640d75cc1af40dc5ee9ed (patch) | |
| tree | 2fe1446a800cfd5a5f52b3bdc16f9dd43968eb57 /tools/perf/util/intlist.h | |
| parent | ddb758d5bb04265c29afbec3496f4b2f2fc2aa09 (diff) | |
| parent | f497c33a948932e2a11b71d1ea07b2eedbc2f0d7 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/acpi.h
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
Diffstat (limited to 'tools/perf/util/intlist.h')
| -rw-r--r-- | tools/perf/util/intlist.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/intlist.h b/tools/perf/util/intlist.h index 62351dad848f..aa6877d36858 100644 --- a/tools/perf/util/intlist.h +++ b/tools/perf/util/intlist.h @@ -9,6 +9,7 @@ struct int_node { struct rb_node rb_node; int i; + void *priv; }; struct intlist { @@ -23,6 +24,7 @@ int intlist__add(struct intlist *ilist, int i); struct int_node *intlist__entry(const struct intlist *ilist, unsigned int idx); struct int_node *intlist__find(struct intlist *ilist, int i); +struct int_node *intlist__findnew(struct intlist *ilist, int i); static inline bool intlist__has_entry(struct intlist *ilist, int i) { |