diff options
author | Vaishali Thakkar <vaishali.thakkar@oracle.com> | 2016-05-19 20:11:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-19 22:12:14 -0400 |
commit | b3d424f1a534949bce27847aa871b3ce75c60f4d (patch) | |
tree | 6eb9e972758385231b235a471a5eab549d2b419a /arch/tile | |
parent | 71bf79cc3ff8e7be3e61399c6a9787d0c57c5cd1 (diff) |
tile: mm: use hugetlb_bad_size()
Update setup_hugepagesz() to call hugetlb_bad_size() when unsupported
hugepage size is found.
Signed-off-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
Cc: Dominik Dingel <dingel@linux.vnet.ibm.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/tile')
-rw-r--r-- | arch/tile/mm/hugetlbpage.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c index e212c64682c5..77ceaa343fce 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c | |||
@@ -308,11 +308,16 @@ static bool saw_hugepagesz; | |||
308 | 308 | ||
309 | static __init int setup_hugepagesz(char *opt) | 309 | static __init int setup_hugepagesz(char *opt) |
310 | { | 310 | { |
311 | int rc; | ||
312 | |||
311 | if (!saw_hugepagesz) { | 313 | if (!saw_hugepagesz) { |
312 | saw_hugepagesz = true; | 314 | saw_hugepagesz = true; |
313 | memset(huge_shift, 0, sizeof(huge_shift)); | 315 | memset(huge_shift, 0, sizeof(huge_shift)); |
314 | } | 316 | } |
315 | return __setup_hugepagesz(memparse(opt, NULL)); | 317 | rc = __setup_hugepagesz(memparse(opt, NULL)); |
318 | if (rc) | ||
319 | hugetlb_bad_size(); | ||
320 | return rc; | ||
316 | } | 321 | } |
317 | __setup("hugepagesz=", setup_hugepagesz); | 322 | __setup("hugepagesz=", setup_hugepagesz); |
318 | 323 | ||