The patch titled oprofile: don't request cache line alignment for cpu_buffer has been removed from the -mm tree. Its filename was oprofile-dont-request-cache-line-alignment-for-cpu_buffer.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: oprofile: don't request cache line alignment for cpu_buffer From: Eric Dumazet <dada1@xxxxxxxxxxxxx> Alignment was previously requested because cpu_buffer was an [NR_CPUS] array, to avoid cache line sharing between CPUS. After commit 608dfddd845da5ab6accef70154c8910529699f7 (oprofile: change cpu_buffer from array to per_cpu variable ), we dont need to force an alignement anymore since cpu_buffer sits in per_cpu zone. Signed-off-by: Eric Dumazet <dada1@xxxxxxxxxxxxx> Cc: Mike Travis <travis@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/oprofile/cpu_buffer.c | 2 +- drivers/oprofile/cpu_buffer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/oprofile/cpu_buffer.c~oprofile-dont-request-cache-line-alignment-for-cpu_buffer drivers/oprofile/cpu_buffer.c --- a/drivers/oprofile/cpu_buffer.c~oprofile-dont-request-cache-line-alignment-for-cpu_buffer +++ a/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 -puN drivers/oprofile/cpu_buffer.h~oprofile-dont-request-cache-line-alignment-for-cpu_buffer drivers/oprofile/cpu_buffer.h --- a/drivers/oprofile/cpu_buffer.h~oprofile-dont-request-cache-line-alignment-for-cpu_buffer +++ a/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); _ Patches currently in -mm which might be from dada1@xxxxxxxxxxxxx are origin.patch linux-next.patch percpu-introduce-define_per_cpu_page_aligned.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html