ARM: 7786/1: hyp: fix macro parameterisation
authorMark Rutland <mark.rutland@arm.com>
Thu, 18 Jul 2013 16:20:32 +0000 (17:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 22 Jul 2013 13:30:34 +0000 (14:30 +0100)
commitb60d5db690f72a7cfe5e39f191f0719a9ef3a096
tree68460ed3afbca3ce216ff97636e9e91e0c3bc524
parentc65b7e98b4edce7faf534154b28eae8fb579144b
ARM: 7786/1: hyp: fix macro parameterisation

Currently, compare_cpu_mode_with_primary uses a mixture of macro
arguments and hardcoded registers, and does so incorrectly, as it
stores (__boot_cpu_mode_offset | BOOT_CPU_MODE_MISMATCH) to
(__boot_cpu_mode + &__boot_cpu_mode_offset), which could corrupt an
arbitrary portion of memory.

This patch fixes up compare_cpu_mode_with_primary to use the macro
arguments, correctly updating __boot_cpu_mode.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <cdall@cs.columbia.edu>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/hyp-stub.S