[PATCH] ARM: mm: fix size rounding-down of arm_add_memory()
Masahiro Yamada
yamada.m at jp.panasonic.com
Thu Jun 5 20:32:47 PDT 2014
The current rounding of "size" is wrong.
size -= start & ~PAGE_MASK;
should be
size -= PAGE_SIZE - (start & ~PAGE_MASK);
Or more simply
size -= aligned_start - start;
Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---
arch/arm/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 50e198c..84508c0 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -641,8 +641,8 @@ int __init arm_add_memory(u64 start, u64 size)
* Ensure that start/size are aligned to a page boundary.
* Size is appropriately rounded down, start is rounded up.
*/
- size -= start & ~PAGE_MASK;
aligned_start = PAGE_ALIGN(start);
+ size -= aligned_start - start;
#ifndef CONFIG_ARCH_PHYS_ADDR_T_64BIT
if (aligned_start > ULONG_MAX) {
--
1.9.1
More information about the linux-arm-kernel
mailing list