Merge branch 'linus' into x86/urgent

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / tools / perf / util / cache.h

diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 27e9ebe4076e0efbf4117a46f2dbbcc74a1dcc3e..fc5e5a09d5b94102b7adaed11518dd8be2c0eb84 100644 (file)
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -34,13 +34,14 @@ extern int pager_use_color;
 extern int use_browser;
 
 #ifdef NO_NEWT_SUPPORT
-static inline void setup_browser(void)
+static inline void setup_browser(bool fallback_to_pager)
 {
-       setup_pager();
+       if (fallback_to_pager)
+               setup_pager();
 }
 static inline void exit_browser(bool wait_for_ok __used) {}
 #else
-void setup_browser(void);
+void setup_browser(bool fallback_to_pager);
 void exit_browser(bool wait_for_ok);
 #endif
 
@@ -82,6 +83,8 @@ extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2
 extern char *perf_pathdup(const char *fmt, ...)
        __attribute__((format (printf, 1, 2)));
 
+#ifdef NO_STRLCPY
 extern size_t strlcpy(char *dest, const char *src, size_t size);
+#endif
 
 #endif /* __PERF_CACHE_H */