From: Olof Johansson <olof@lixom.net>
Date: Wed, 11 Sep 2013 22:27:41 +0000 (-0700)
Subject: ARM: kvm: rename cpu_reset to avoid name clash
X-Git-Tag: v3.12-rc4~33^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac570e0493815e0b41681c89cb50d66421429d27;p=pandora-kernel.git

ARM: kvm: rename cpu_reset to avoid name clash

cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
so it expands here and causes problems.

Cc: <stable@vger.kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---

Reading git-diff-tree failed