projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perf/core
[linux-2.6-block.git]
/
kernel
/
perf_event.c
diff --git
a/kernel/perf_event.c
b/kernel/perf_event.c
index 4aa50ff4efc04829c34215283f9a5134925d6c9e..fcf42dcd6089b119732601a037b786e909f2c866 100644
(file)
--- a/
kernel/perf_event.c
+++ b/
kernel/perf_event.c
@@
-15,6
+15,7
@@
#include <linux/smp.h>
#include <linux/file.h>
#include <linux/poll.h>
+#include <linux/slab.h>
#include <linux/sysfs.h>
#include <linux/dcache.h>
#include <linux/percpu.h>