summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-08-17 12:30:36 -0500
committerTejun Heo <tj@kernel.org>2014-08-26 13:45:47 -0400
commit1f125e76f5c134b0a904ef30e96ee8da6a49f4b4 (patch)
treed63adcc36233887d4bba14748dfaf37ba8946cbf
parent903ceff7ca7b4d80c083a80ee5163b74e9fa359f (diff)
downloadlinux-stable-1f125e76f5c134b0a904ef30e96ee8da6a49f4b4.tar.gz
linux-stable-1f125e76f5c134b0a904ef30e96ee8da6a49f4b4.tar.bz2
linux-stable-1f125e76f5c134b0a904ef30e96ee8da6a49f4b4.zip
md: Replace __this_cpu_ptr with raw_cpu_ptr
__this_cpu_ptr is being phased out. Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/md/dm-stats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index 28a90122a5a8..87f86c77b094 100644
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -548,7 +548,7 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
* A race condition can at worst result in the merged flag being
* misrepresented, so we don't have to disable preemption here.
*/
- last = __this_cpu_ptr(stats->last);
+ last = raw_cpu_ptr(stats->last);
stats_aux->merged =
(bi_sector == (ACCESS_ONCE(last->last_sector) &&
((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==