diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 20:18:13 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 20:18:13 +0100 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /arch/x86/mm/mmap.c | |
| parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
| download | kernel_goldelico_gta04-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip kernel_goldelico_gta04-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.gz kernel_goldelico_gta04-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.bz2 | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'arch/x86/mm/mmap.c')
| -rw-r--r-- | arch/x86/mm/mmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 62c29a5..25e7e13 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -112,11 +112,13 @@ static unsigned long mmap_legacy_base(void) */ void arch_pick_mmap_layout(struct mm_struct *mm) { + mm->mmap_legacy_base = mmap_legacy_base(); + mm->mmap_base = mmap_base(); + if (mmap_is_legacy()) { - mm->mmap_base = mmap_legacy_base(); + mm->mmap_base = mm->mmap_legacy_base; mm->get_unmapped_area = arch_get_unmapped_area; } else { - mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; } } |