[kvm-unit-tests PATCH v2 6/8] stack: share api prototypes

Andrew Jones
2016-04-19T16:19:46Z

lib/stack.h | 9 +++++----
lib/x86/asm/stack.h | 3 ---
2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/stack.h b/lib/stack.h
index bb6b9aa70876d..cfc66f442f997 100644
--- a/lib/stack.h
+++ b/lib/stack.h
@@ -4,7 +4,10 @@
#include <libcflat.h>
#include <asm/stack.h>

-#ifndef HAVE_ARCH_BACKTRACE_FRAME
+#ifdef HAVE_ARCH_BACKTRACE_FRAME
+extern int backtrace_frame(const void *frame, const void **return_addrs,
+ int max_depth);
+#else
static inline int
backtrace_frame(const void *frame __unused, const void **return_addrs __unused,
int max_depth __unused)
@@ -13,8 +16,6 @@ backtrace_frame(const void *frame __unused, const void **return_addrs __unused,
}
#endif

-#ifndef HAVE_ARCH_BACKTRACE
-int backtrace(const void **return_addrs, int max_depth);
-#endif
+extern int backtrace(const void **return_addrs, int max_depth);

#endif
diff --git a/lib/x86/asm/stack.h b/lib/x86/asm/stack.h
index fc4766d37b172..b14e2c0fa012e 100644
--- a/lib/x86/asm/stack.h
+++ b/lib/x86/asm/stack.h
@@ -6,9 +6,6 @@
#endif

#define HAVE_ARCH_BACKTRACE_FRAME
-int backtrace_frame(const void *frame, const void **return_addrs, int max_depth);
-
#define HAVE_ARCH_BACKTRACE
-int backtrace(const void **return_addrs, int max_depth);

#endif
--
2.4.11