diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-07 14:29:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-07 14:29:23 +1100 |
| commit | 30c4fbf7e3977ec8c2966a633cd281b44e3a63fd (patch) | |
| tree | b8d7dc9ac82e3f179d886311a6b73c9c5c52c35d /arch/powerpc/mm/hugetlbpage.c | |
| parent | 725a7c316ea0d1329b630e31f82d0a2e762e0a65 (diff) | |
| parent | df2363d9ad7ffd43b5e86604c7a28f4adc6bd75e (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 1a6de0a7d8eb..5dc52d803ed8 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -742,7 +742,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, struct hstate *hstate = hstate_file(file); int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); - return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); + return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1); } #endif |