diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /kernel/perf_event.c | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 4aa50ff4efc0..fcf42dcd6089 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
| 16 | #include <linux/file.h> | 16 | #include <linux/file.h> |
| 17 | #include <linux/poll.h> | 17 | #include <linux/poll.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/sysfs.h> | 19 | #include <linux/sysfs.h> |
| 19 | #include <linux/dcache.h> | 20 | #include <linux/dcache.h> |
| 20 | #include <linux/percpu.h> | 21 | #include <linux/percpu.h> |