| From f8fa0614bed4fa0a5acac96d0ed77c265aaea829 Mon Sep 17 00:00:00 2001 |
| From: Yury Norov <ynorov@caviumnetworks.com> |
| Date: Wed, 2 Dec 2015 14:00:10 +0000 |
| Subject: arm64: fix COMPAT_SHMLBA definition for large pages |
| |
| [ Upstream commit b9b7aebb42d1b1392f3111de61136bb6cf3aae3f ] |
| |
| ARM glibc uses (4 * __getpagesize()) for SHMLBA, which is correct for |
| 4KB pages and works fine for 64KB pages, but the kernel uses a hardcoded |
| 16KB that is too small for 64KB page based kernels. This changes the |
| definition to what user space sees when using 64KB pages. |
| |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Yury Norov <ynorov@caviumnetworks.com> |
| Signed-off-by: Will Deacon <will.deacon@arm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/include/asm/shmparam.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm64/include/asm/shmparam.h b/arch/arm64/include/asm/shmparam.h |
| index 4df608a8459e..e368a55ebd22 100644 |
| --- a/arch/arm64/include/asm/shmparam.h |
| +++ b/arch/arm64/include/asm/shmparam.h |
| @@ -21,7 +21,7 @@ |
| * alignment value. Since we don't have aliasing D-caches, the rest of |
| * the time we can safely use PAGE_SIZE. |
| */ |
| -#define COMPAT_SHMLBA 0x4000 |
| +#define COMPAT_SHMLBA (4 * PAGE_SIZE) |
| |
| #include <asm-generic/shmparam.h> |
| |
| -- |
| 2.19.1 |
| |
