Merge branch 'master' into for-2.6.35

[~andy/linux] / tools / perf / perf.h

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 6fb379bc1d1fec0c4c9384fdf2e301d4445a8a01..ef7aa0a0c5265191e8120e76f9f134b5e241fa53 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -1,6 +1,10 @@
 #ifndef _PERF_PERF_H
 #define _PERF_PERF_H
 
+struct winsize;
+
+void get_term_dimensions(struct winsize *ws);
+
 #if defined(__i386__)
 #include "../../arch/x86/include/asm/unistd.h"
 #define rmb()          asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
@@ -76,6 +80,7 @@
 
 #include "../../include/linux/perf_event.h"
 #include "util/types.h"
+#include <stdbool.h>
 
 /*
  * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all
@@ -102,8 +107,6 @@ static inline unsigned long long rdclock(void)
 #define __user
 #define asmlinkage
 
-#define __used         __attribute__((__unused__))
-
 #define unlikely(x)    __builtin_expect(!!(x), 0)
 #define min(x, y) ({                           \
        typeof(x) _min1 = (x);                  \
@@ -129,4 +132,6 @@ struct ip_callchain {
        u64 ips[0];
 };
 
+extern bool perf_host, perf_guest;
+
 #endif