diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:42:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:42:07 +0100 |
| commit | 6aa447bcbb444cd1b738613a20627f288d631665 (patch) | |
| tree | 62030bb14be0006248181305ac1fe377a99e5b65 /arch/x86/mm/mmap.c | |
| parent | abedf8e2419fb873d919dd74de2e84b510259339 (diff) | |
| parent | 48be3a67da7413d62e5efbcf2c73a9dddf61fb96 (diff) | |
| download | linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.bz2 | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; } |