diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 15:18:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 15:31:07 +1100 |
| commit | 9c9ce516d8594d02b113cd27b92b15b272e13859 (patch) | |
| tree | 426456b03bf50eb440da78bbc471ed408443e868 /arch/s390/mm/mmap.c | |
| parent | 5e73a53613dab2589117c595acafa1b8c682e951 (diff) | |
| parent | cc321d523dc4a7e0e1a4adaa70342f1ca9af2964 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/s390/mm/mmap.c')
| -rw-r--r-- | arch/s390/mm/mmap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index 06bafec00278..40023290ee5b 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -91,11 +91,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } } @@ -176,11 +174,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; mm->get_unmapped_area = s390_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = s390_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } } |