Add a function is_valid_hpage_size Signed-off-by: Zou Nan hai <nanhai.zou@xxxxxxxxx> diff -Nraup a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c --- a/arch/ia64/mm/hugetlbpage.c 2006-04-11 08:52:02.000000000 +0800 +++ b/arch/ia64/mm/hugetlbpage.c 2006-04-11 09:00:37.000000000 +0800 @@ -159,28 +159,15 @@ unsigned long hugetlb_get_unmapped_area( static int __init hugetlb_setup_sz(char *str) { - u64 tr_pages; unsigned long long size; - if (ia64_pal_vm_page_size(&tr_pages, NULL) != 0) - /* - * shouldn't happen, but just in case. - */ - tr_pages = 0x15557000UL; - size = memparse(str, &str); - if (*str || (size & (size-1)) || !(tr_pages & size) || - size <= PAGE_SIZE || - size >= (1UL << PAGE_SHIFT << MAX_ORDER)) { + if (*str || !is_valid_hpage_size(size)) { printk(KERN_WARNING "Invalid huge page size specified\n"); return 1; } hpage_shift = __ffs(size); - /* - * boot cpu already executed ia64_mmu_init, and has HPAGE_SHIFT_DEFAULT - * override here with new page shift. - */ ia64_set_rr(HPAGE_REGION_BASE, hpage_shift << 2); return 1; } @@ -191,3 +178,18 @@ void hugepage_size_init(struct mm_struct mm->hugepage_shift = hpage_shift; } +int is_valid_hpage_size(unsigned long long size) +{ + u64 tr_pages; + if (ia64_pal_vm_page_size(&tr_pages, NULL) != 0) + /* + * shouldn't happen, but just in case. + */ + tr_pages = 0x15557000UL; + if((size & (size-1)) || !(tr_pages & size) || + size <= PAGE_SIZE || + size >= (1UL << PAGE_SHIFT << MAX_ORDER)) + return 0; + return 1; +} + diff -Nraup a/include/linux/mm.h b/include/linux/mm.h --- a/include/linux/mm.h 2006-04-11 08:52:00.000000000 +0800 +++ b/include/linux/mm.h 2006-04-11 09:17:36.000000000 +0800 @@ -1061,8 +1061,13 @@ extern int randomize_va_space; #ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE #define hugepage_size_init(mm) +static inline int is_valid_hpage_size(unsigned long long size) +{ + return 1; +} #else extern void hugepage_size_init(struct mm_struct *mm); +extern int is_valid_hpage_size(unsigned long long size); #endif #endif /* __KERNEL__ */ - : send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |