ARM: kvm: rename cpu_reset to avoid name clash
authorOlof Johansson <olof@lixom.net>
Wed, 11 Sep 2013 22:27:41 +0000 (15:27 -0700)
committerChristoffer Dall <christoffer.dall@linaro.org>
Thu, 2 Oct 2014 15:18:06 +0000 (17:18 +0200)
commitc3832c083abf356e0df1b581df22ee8a21034841
tree8819bda7f96ca00ed86f3ee427e2057de74c1726
parent78169fda11a0b68310885d8991399bc3a51e5b2d
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>
(cherry picked from commit ac570e0493815e0b41681c89cb50d66421429d27)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
arch/arm/kvm/reset.c