diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/oprofile/cpu_buffer.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
| -rw-r--r-- | drivers/oprofile/cpu_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index efcbf4b4579f..2450b3a393ff 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include "buffer_sync.h" | 27 | #include "buffer_sync.h" |
| 28 | #include "oprof.h" | 28 | #include "oprof.h" |
| 29 | 29 | ||
| 30 | DEFINE_PER_CPU_SHARED_ALIGNED(struct oprofile_cpu_buffer, cpu_buffer); | 30 | DEFINE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); |
| 31 | 31 | ||
| 32 | static void wq_sync_buffer(struct work_struct *work); | 32 | static void wq_sync_buffer(struct work_struct *work); |
| 33 | 33 | ||