From: Tejun Heo <tj@kernel.org>
Date: Thu, 8 Mar 2012 18:53:57 +0000 (-0800)
Subject: blkcg: don't use percpu for merged stats
X-Git-Tag: v3.5-rc1~42^2~55
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fe224d2d5fbf8f020b30d0ba69fed7856923752;p=pandora-kernel.git

blkcg: don't use percpu for merged stats

With recent plug merge updates, merged stats are no longer called for
plug merges and now only updated while holding queue_lock.  As
stats_lock is scheduled to be removed, there's no reason to use percpu
for merged stats.  Don't use percpu for merged stats.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

Reading git-diff-tree failed