OSDN Git Service

ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
authorWill Deacon <will.deacon@arm.com>
Fri, 20 Jan 2012 11:10:18 +0000 (12:10 +0100)
committerTodd Poynor <toddpoynor@google.com>
Sat, 10 Mar 2012 05:44:42 +0000 (21:44 -0800)
commit2cdb45d19ebd62bcd249b4cff49c414fcf1f420c
tree5e5f85aff20cab5c6f4b366ba1672b9aac65d708
parente078a22b6f226ecf4cf3add7e5a7cb09b458bff1
ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards

commit 612539e81f655f6ac73c7af1da8701c1ee618aee upstream.

On v7, we use the same cache maintenance instructions for data lines
as for unified lines. This was not the case for v6, where HARVARD_CACHE
was defined to indicate the L1 cache topology.

This patch removes the erroneous compile-time check for HARVARD_CACHE in
proc-v7.S, ensuring that we perform I-side invalidation at boot.

Reported-and-Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Catalin Marinas <Catalin.Marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mm/proc-v7.S