Merge tag 'dm-3.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[thirdparty/kernel/stable.git] / drivers / md / dm-stats.c

diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index 42a057aa3811ac863a1db066d948a6e60d01b67d..f478a4c96d2f55cb2cf75abe50bfc2ce365c2a8e 100644 (file)
--- 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)) ==