summaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-08-20 00:31:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-08-20 00:31:33 +0100
commite1f020371c08ea93be417ba3b1990b169e7e6e36 (patch)
tree89917310b6a90da53849d700fb2532623e3654d8 /arch/arm/kernel
parent4f9b4fb7a2091eec339413a460b1665758401828 (diff)
parentac124504ecf6b20a2457d873d0728a8b991a5b0c (diff)
Merge branch 'security-fixes' into fixes
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/fiq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
index fc7920288a3d..918875d96d5d 100644
--- a/arch/arm/kernel/fiq.c
+++ b/arch/arm/kernel/fiq.c
@@ -89,7 +89,8 @@ void set_fiq_handler(void *start, unsigned int length)
memcpy(base + offset, start, length);
if (!cache_is_vipt_nonaliasing())
- flush_icache_range(base + offset, offset + length);
+ flush_icache_range((unsigned long)base + offset, offset +
+ length);
flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);
}