diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-13 05:43:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-13 05:43:53 -0700 |
| commit | 9ed8bfe3f2b22fedbd9f7eaa7ccb060851a3334e (patch) | |
| tree | e8795abd658511ebd52279c168f20dbf797d8c18 /arch/x86/mm/mmap.c | |
| parent | d58d587e95f6d19f903a4e4c0cbd26cfcadb1f6c (diff) | |
| parent | c568eb7aca15625b4afdd922350b9b352ea78c2f (diff) | |
Merge "Merge branch 'tmp-bab1564' into msm-4.4"
Diffstat (limited to 'arch/x86/mm/mmap.c')
| -rw-r--r-- | arch/x86/mm/mmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 96bd1e2bffaf..72bb52f93c3d 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -71,12 +71,12 @@ unsigned long arch_mmap_rnd(void) if (mmap_is_ia32()) #ifdef CONFIG_COMPAT - rnd = (unsigned long)get_random_int() & ((1 << mmap_rnd_compat_bits) - 1); + rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1); #else - rnd = (unsigned long)get_random_int() & ((1 << mmap_rnd_bits) - 1); + rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1); #endif else - rnd = (unsigned long)get_random_int() & ((1 << mmap_rnd_bits) - 1); + rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1); return rnd << PAGE_SHIFT; } |
