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/unwind.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/unwind.h')
-rw-r--r-- | tools/perf/util/unwind.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h index cb6bc503a792..ec0c71a2ca2e 100644 --- a/tools/perf/util/unwind.h +++ b/tools/perf/util/unwind.h @@ -13,7 +13,7 @@ struct unwind_entry { typedef int (*unwind_entry_cb_t)(struct unwind_entry *entry, void *arg); -#ifdef LIBUNWIND_SUPPORT +#ifdef HAVE_LIBUNWIND_SUPPORT int unwind__get_entries(unwind_entry_cb_t cb, void *arg, struct machine *machine, struct thread *thread, @@ -31,5 +31,5 @@ unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, { return 0; } -#endif /* LIBUNWIND_SUPPORT */ +#endif /* HAVE_LIBUNWIND_SUPPORT */ #endif /* __UNWIND_H */ |