From c4d89eade83e31bd4b80ac921c1542eb6a05a43a Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 24 Jun 2009 15:13:47 +0900
Subject: [PATCH] --- yaml --- r: 161631 b: refs/heads/master c:
 b9bf3121af348d9255f1c917830fe8c2df52efcb h: refs/heads/master i:   161629:
 2dff565ec8a9c5aa2c4ee8b70fb4d809d9f4f78f   161627:
 b3dbf2102e72399867c6504a3e94ecb4ac6b861c   161623:
 0c591d8e194bf0db474e565e9a1d05baa09d21b6   161615:
 359203d10660f6fdf5bc1048a408cd375e620cb2   161599:
 eb00e63b51771ca0b0d2432222e174ae416d611e v: v3

---
 [refs]                              | 2 +-
 trunk/arch/blackfin/mm/sram-alloc.c | 6 +++---
 trunk/arch/ia64/kernel/smp.c        | 3 ++-
 trunk/kernel/sched.c                | 4 ++--
 trunk/net/rds/ib_stats.c            | 2 +-
 trunk/net/rds/iw_stats.c            | 2 +-
 trunk/net/rds/page.c                | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 133e6195f992..be0dee81517b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 204fba4aa303ea4a7bb726a539bf4a5b9e3203d0
+refs/heads/master: b9bf3121af348d9255f1c917830fe8c2df52efcb
diff --git a/trunk/arch/blackfin/mm/sram-alloc.c b/trunk/arch/blackfin/mm/sram-alloc.c
index 0bc3c4ef0aad..99e4dbb1dfd1 100644
--- a/trunk/arch/blackfin/mm/sram-alloc.c
+++ b/trunk/arch/blackfin/mm/sram-alloc.c
@@ -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 */
diff --git a/trunk/arch/ia64/kernel/smp.c b/trunk/arch/ia64/kernel/smp.c
index 94cf78ba28fa..93ebfea43c6c 100644
--- a/trunk/arch/ia64/kernel/smp.c
+++ b/trunk/arch/ia64/kernel/smp.c
@@ -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
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 7c9098d186e6..34fd81d21784 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -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
diff --git a/trunk/net/rds/ib_stats.c b/trunk/net/rds/ib_stats.c
index 02e3e3d50d4a..301ae51ae409 100644
--- a/trunk/net/rds/ib_stats.c
+++ b/trunk/net/rds/ib_stats.c
@@ -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",
diff --git a/trunk/net/rds/iw_stats.c b/trunk/net/rds/iw_stats.c
index ccc7e8f0bf0e..fafea3cc92d7 100644
--- a/trunk/net/rds/iw_stats.c
+++ b/trunk/net/rds/iw_stats.c
@@ -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",
diff --git a/trunk/net/rds/page.c b/trunk/net/rds/page.c
index c460743a89ad..de7bb84bcd78 100644
--- a/trunk/net/rds/page.c
+++ b/trunk/net/rds/page.c
@@ -39,7 +39,7 @@ struct rds_page_remainder {
 	unsigned long	r_offset;
 };
 
-DEFINE_PER_CPU(struct rds_page_remainder, rds_page_remainders) ____cacheline_aligned;
+DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_page_remainder, rds_page_remainders);
 
 /*
  * returns 0 on success or -errno on failure.