summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorYury Norov <ynorov@caviumnetworks.com>2015-12-02 14:00:10 +0000
committerBen Hutchings <ben@decadent.org.uk>2020-01-11 02:04:49 +0000
commitc325515b53a6e378f2e2c78be2dc970ae7ad2302 (patch)
tree6c392626070d8e5a1179be1e1acc631c96e1718e /arch/arm64
parent17855e598966731f47851d77ba6486a7941af1b9 (diff)
downloadlinux-stable-c325515b53a6e378f2e2c78be2dc970ae7ad2302.tar.gz
linux-stable-c325515b53a6e378f2e2c78be2dc970ae7ad2302.tar.bz2
linux-stable-c325515b53a6e378f2e2c78be2dc970ae7ad2302.zip
arm64: fix COMPAT_SHMLBA definition for large pages
commit b9b7aebb42d1b1392f3111de61136bb6cf3aae3f upstream. 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> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/include/asm/shmparam.h2
1 files changed, 1 insertions, 1 deletions
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>