summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-28 12:24:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-28 12:24:43 -0700
commit5904b3b81d25166e5e39b9727645bb47937618e3 (patch)
tree2a306f8b0cdea354b3ebc157623dededcf471091 /include
parentf3866db8f7534ba8bbb342bebcf5ede542035528 (diff)
parentb70e4f0529c089b00d0a6da13106db4de1ada4c7 (diff)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h perf record: prevent kill(0, SIGTERM); perf session: Remove threads from tree on PERF_RECORD_EXIT perf/tracing: Fix regression of perf losing kprobe events perf_events: Fix Intel Westmere event constraints perf record: Don't call newt functions when not initialized
Diffstat (limited to 'include')
-rw-r--r--include/linux/tracepoint.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 9a59d1f98cd..103d1b61aac 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -14,6 +14,7 @@
* See the file COPYING for more details.
*/
+#include <linux/errno.h>
#include <linux/types.h>
#include <linux/rcupdate.h>