Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9bf3121 authored by Tejun Heo's avatar Tejun Heo
Browse files

percpu: use DEFINE_PER_CPU_SHARED_ALIGNED() 



There are a few places where ___cacheline_aligned* is used with
DEFINE_PER_CPU().  Use DEFINE_PER_CPU_SHARED_ALIGNED() instead.

DEFINE_PER_CPU_SHARED_ALIGNED() applies alignment only on SMPs.  While
all other converted places used _in_smp variant or only get compiled
for SMP, net/rds used unconditional ____cacheline_aligned.  I don't
see any reason these data structures should be aligned on UP and thus
converted together.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Andy Grover <andy.grover@oracle.com>
parent 204fba4a

arch/blackfin/mm/sram-alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ 
#include <asm/mem_map.h>

#include "blackfin_sram.h"



static DEFINE_PER_CPU(spinlock_t, l1sram_lock) ____cacheline_aligned_in_smp;

static DEFINE_PER_CPU(spinlock_t, l1_data_sram_lock) ____cacheline_aligned_in_smp;

static DEFINE_PER_CPU(spinlock_t, l1_inst_sram_lock) ____cacheline_aligned_in_smp;

static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1sram_lock);

static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1_data_sram_lock);

static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1_inst_sram_lock);

static spinlock_t l2_sram_lock ____cacheline_aligned_in_smp;



/* the data structure for L1 scratchpad and DATA SRAM */

arch/ia64/kernel/smp.c

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ static struct local_tlb_flush_counts { 
	unsigned int count;

} __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS];



static DEFINE_PER_CPU(unsigned short [NR_CPUS], shadow_flush_counts) ____cacheline_aligned;

static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned short [NR_CPUS],

				     shadow_flush_counts);



#define IPI_CALL_FUNC		0

#define IPI_CPU_STOP		1

kernel/sched.c

+2 −2
Original line number Diff line number Diff line
@@ -318,12 +318,12 @@ struct task_group root_task_group; 
/* Default task group's sched entity on each cpu */

static DEFINE_PER_CPU(struct sched_entity, init_sched_entity);

/* Default task group's cfs_rq on each cpu */

static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp;

static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_cfs_rq);

#endif /* CONFIG_FAIR_GROUP_SCHED */



#ifdef CONFIG_RT_GROUP_SCHED

static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity);

static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) ____cacheline_aligned_in_smp;

static DEFINE_PER_CPU_SHARED_ALIGNED(struct rt_rq, init_rt_rq);

#endif /* CONFIG_RT_GROUP_SCHED */

#else /* !CONFIG_USER_SCHED */

#define root_task_group init_task_group

net/rds/ib_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "rds.h"

#include "ib.h"



DEFINE_PER_CPU(struct rds_ib_statistics, rds_ib_stats) ____cacheline_aligned;

DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);



static char *rds_ib_stat_names[] = {

	"ib_connect_raced",

net/rds/iw_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "rds.h"

#include "iw.h"



DEFINE_PER_CPU(struct rds_iw_statistics, rds_iw_stats) ____cacheline_aligned;

DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_iw_statistics, rds_iw_stats);



static char *rds_iw_stat_names[] = {

	"iw_connect_raced",