diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /net/rds/ib_stats.c | |
| parent | 04a13c7c632e1fe04a5f6e6c83565d2559e37598 (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
| download | kernel_samsung_espresso10-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip kernel_samsung_espresso10-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.gz kernel_samsung_espresso10-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.bz2 | |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'net/rds/ib_stats.c')
| -rw-r--r-- | net/rds/ib_stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/ib_stats.c b/net/rds/ib_stats.c index 02e3e3d..301ae51 100644 --- a/net/rds/ib_stats.c +++ b/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", |