From dd9a4a9f7b118fd6be07181fa1c06d72571c23f7 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 31 Mar 2009 15:23:15 -0700 Subject: [PATCH] --- yaml --- r: 139153 b: refs/heads/master c: e2f17d9459aeccf4e013e31cbd741d6b1858eec4 h: refs/heads/master i: 139151: 17ee7c4c808fbd31fb2b7e40a5976ff940176012 v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 49386b55092b..8752f9b10d11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1d7487173eab8352125cf6cc271940f24254bd4 +refs/heads/master: e2f17d9459aeccf4e013e31cbd741d6b1858eec4 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 107da3d809a8..28c655ba9353 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -918,7 +918,7 @@ static void return_unused_surplus_pages(struct hstate *h, * an instantiated the change should be committed via vma_commit_reservation. * No action is required on failure. */ -static int vma_needs_reservation(struct hstate *h, +static long vma_needs_reservation(struct hstate *h, struct vm_area_struct *vma, unsigned long addr) { struct address_space *mapping = vma->vm_file->f_mapping; @@ -933,7 +933,7 @@ static int vma_needs_reservation(struct hstate *h, return 1; } else { - int err; + long err; pgoff_t idx = vma_hugecache_offset(h, vma, addr); struct resv_map *reservations = vma_resv_map(vma); @@ -969,7 +969,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, struct page *page; struct address_space *mapping = vma->vm_file->f_mapping; struct inode *inode = mapping->host; - unsigned int chg; + long chg; /* * Processes that did not create the mapping will have no reserves and