projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: dts: rockchip: change N key to home for rk3399 VR product
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
mm
/
mmap.c
diff --git
a/arch/arm64/mm/mmap.c
b/arch/arm64/mm/mmap.c
index ed177475dd8ce6abbee845f40e1cdbe3ebe72adb..232f787a088ae8e992c52cba450159a43a900174 100644
(file)
--- a/
arch/arm64/mm/mmap.c
+++ b/
arch/arm64/mm/mmap.c
@@
-51,8
+51,12
@@
unsigned long arch_mmap_rnd(void)
{
unsigned long rnd;
{
unsigned long rnd;
- rnd = (unsigned long)get_random_int() & STACK_RND_MASK;
-
+#ifdef CONFIG_COMPAT
+ if (test_thread_flag(TIF_32BIT))
+ rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1);
+ else
+#endif
+ rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1);
return rnd << PAGE_SHIFT;
}
return rnd << PAGE_SHIFT;
}