projects / unionfs-2.6.39.y.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 961bd4a) | patch
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Oct 2013 01:14:27 +0000 (18:14 -0700)
commitc6bdbcd2f5f55d7f61a61ceee2f342bcfeddbe15
tree8afbae8d9cb0cbd33462354180264e6996a3d02dtree | snapshot
parent961bd4a98ca7e14b6656a10c943aa3f5e8aa099fcommit | diff
ARM: kvm: rename cpu_reset to avoid name clash

commit ac570e0493815e0b41681c89cb50d66421429d27 upstream.

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

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/kvm/reset.c diff | blob | history
unionfs2-2.6.39.y