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 02821febb704733462845599292a7afa332c03c8..ef7aa0a0c5265191e8120e76f9f134b5e241fa53 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -80,6 +80,7 @@ void get_term_dimensions(struct winsize *ws);
 
 #include "../../include/linux/perf_event.h"
 #include "util/types.h"
+#include <stdbool.h>
 
 /*
  * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all
@@ -131,6 +132,6 @@ struct ip_callchain {
        u64 ips[0];
 };
 
-extern int perf_host, perf_guest;
+extern bool perf_host, perf_guest;
 
 #endif