diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 09:19:53 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 09:19:53 (GMT) |
| commit | 064a32d82c20cdcb0119a8b316eb520608d8c647 (patch) | |
| tree | c67d534bd4458b1482c11f11c724fe93beca4f80 /drivers/oprofile | |
| parent | 0327318445d55808991a63137cfb698a90ab6adf (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
| download | linux-fsl-qoriq-064a32d82c20cdcb0119a8b316eb520608d8c647.tar.xz | |
Merge branch 'linus' into x86/memtest
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/cpu_buffer.c | 2 | ||||
| -rw-r--r-- | drivers/oprofile/cpu_buffer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index efcbf4b..2450b3a 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c @@ -27,7 +27,7 @@ #include "buffer_sync.h" #include "oprof.h" -DEFINE_PER_CPU_SHARED_ALIGNED(struct oprofile_cpu_buffer, cpu_buffer); +DEFINE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); static void wq_sync_buffer(struct work_struct *work); diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h index 1358817..c3e366b 100644 --- a/drivers/oprofile/cpu_buffer.h +++ b/drivers/oprofile/cpu_buffer.h @@ -46,7 +46,7 @@ struct oprofile_cpu_buffer { unsigned long sample_invalid_eip; int cpu; struct delayed_work work; -} ____cacheline_aligned; +}; DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); |