From: Christoph Lameter Date: Sun, 17 Aug 2014 17:30:36 +0000 (-0500) Subject: md: Replace __this_cpu_ptr with raw_cpu_ptr X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f125e76f5c134b0a904ef30e96ee8da6a49f4b4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git md: Replace __this_cpu_ptr with raw_cpu_ptr __this_cpu_ptr is being phased out. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo --- 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)) ==