| commit | c3832c083abf356e0df1b581df22ee8a21034841 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Sep 11 15:27:41 2013 -0700 |
| committer | Christoffer Dall <christoffer.dall@linaro.org> | Thu Oct 02 17:18:06 2014 +0200 |
| tree | 8819bda7f96ca00ed86f3ee427e2057de74c1726 | |
| parent | 78169fda11a0b68310885d8991399bc3a51e5b2d [diff] |
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>