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]
/
arch
/
x86
/
kernel
/
cpu
/
perf_event.c
diff --git
a/arch/x86/kernel/cpu/perf_event.c
b/arch/x86/kernel/cpu/perf_event.c
index 353a174adb4478bd7ece980169d706cb0c7143d7..626154a9f535b28d53140b60e5b360a6a1a0db75 100644
(file)
--- a/
arch/x86/kernel/cpu/perf_event.c
+++ b/
arch/x86/kernel/cpu/perf_event.c
@@
-21,6
+21,7
@@
#include <linux/kdebug.h>
#include <linux/sched.h>
#include <linux/uaccess.h>
+#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/cpu.h>
#include <linux/bitops.h>