The patch titled Subject: mm/hugetlb.c: make vma_has_reserves() return bool has been added to the -mm tree. Its filename is mm-make-the-function-vma_has_reserves-bool.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-make-the-function-vma_has_reserves-bool.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-make-the-function-vma_has_reserves-bool.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Nicholas Krause <xerofoify@xxxxxxxxx> Subject: mm/hugetlb.c: make vma_has_reserves() return bool This makes vma_has_reserves() return bool due to this particular function only returning either one or zero as its return value. Signed-off-by: Nicholas Krause <xerofoify@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN mm/hugetlb.c~mm-make-the-function-vma_has_reserves-bool mm/hugetlb.c --- a/mm/hugetlb.c~mm-make-the-function-vma_has_reserves-bool +++ a/mm/hugetlb.c @@ -616,7 +616,7 @@ void reset_vma_resv_huge_pages(struct vm } /* Returns true if the VMA has associated reserve pages */ -static int vma_has_reserves(struct vm_area_struct *vma, long chg) +static bool vma_has_reserves(struct vm_area_struct *vma, long chg) { if (vma->vm_flags & VM_NORESERVE) { /* @@ -629,23 +629,23 @@ static int vma_has_reserves(struct vm_ar * properly, so add work-around here. */ if (vma->vm_flags & VM_MAYSHARE && chg == 0) - return 1; + return true; else - return 0; + return false; } /* Shared mappings always use reserves */ if (vma->vm_flags & VM_MAYSHARE) - return 1; + return true; /* * Only the process that called mmap() has reserves for * private mappings. */ if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) - return 1; + return true; - return 0; + return false; } static void enqueue_huge_page(struct hstate *h, struct page *page) _ Patches currently in -mm which might be from xerofoify@xxxxxxxxx are hugetlb-make-the-function-vma_shareable-bool.patch mm-change-function-return-from-int-to-bool-for-the-function-is_page_busy.patch memory-make-the-function-tlb_next_batch-bool-now.patch mm-make-the-function-madvise_behaviour_valid-bool.patch mm-make-the-function-vma_has_reserves-bool.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html