__this_cpu_ptr is being phased out.
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
                 * 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)) ==