diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-04-23 08:30:22 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-04-23 08:30:22 -0400 |
| commit | a36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch) | |
| tree | c5c999baa4c214218e3adea9b336cbd9f23950ad /drivers/oprofile | |
| parent | bc078e4eab65f11bbaeed380593ab8151b30d703 (diff) | |
| parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/buffer_sync.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index c9e2ae90f19..a9352b2c7ac 100644 --- a/drivers/oprofile/buffer_sync.c +++ b/drivers/oprofile/buffer_sync.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
| 31 | #include <linux/oprofile.h> | 31 | #include <linux/oprofile.h> |
| 32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | 34 | ||
| 34 | #include "oprofile_stats.h" | 35 | #include "oprofile_stats.h" |
| 35 | #include "event_buffer.h" | 36 | #include "event_buffer.h" |