diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /arch/powerpc/mm/hugetlbpage.c | |
| parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
| parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
| download | kernel_samsung_smdk4412-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.gz kernel_samsung_smdk4412-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.bz2 kernel_samsung_smdk4412-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index deb494687a6..201c7a5486c 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -506,6 +506,9 @@ 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)); + + if (!mmu_huge_psizes[mmu_psize]) + return -EINVAL; return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); } |