diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-08-04 04:39:31 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-09 03:42:38 -0400 |
commit | bf912d99e94cd1f43a7decce2e9b79a3ca7f2418 (patch) | |
tree | 16a6ffb520d880cdc8662539d3369960e81cb5ba /arch/arm/mm | |
parent | 7760d54600a3d6206551c12eb53931ce7369d424 (diff) |
ARM: 7010/1: mm: fix invalid loop for poison_init_mem
poison_init_mem() used a loop of:
while ((count = count - 4))
which has 2 problems - an off by one error so that we do one less word
than we should, and the other is that if count == 0 then we loop forever
and poison too much. On a platform with HAVE_TCM=y but nothing in the
TCM's, this caused corruption and the platform failed to boot.
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 2fee782077c1..91bca355cd31 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -441,7 +441,7 @@ static inline int free_area(unsigned long pfn, unsigned long end, char *s) | |||
441 | static inline void poison_init_mem(void *s, size_t count) | 441 | static inline void poison_init_mem(void *s, size_t count) |
442 | { | 442 | { |
443 | u32 *p = (u32 *)s; | 443 | u32 *p = (u32 *)s; |
444 | while ((count = count - 4)) | 444 | for (; count != 0; count -= 4) |
445 | *p++ = 0xe7fddef0; | 445 | *p++ = 0xe7fddef0; |
446 | } | 446 | } |
447 | 447 | ||