summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2013-10-02 14:25:09 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-02 20:02:35 -0400
commit26794942461f438a6bc725ec7294b08a6bd782c4 (patch)
treea6357a628342e523374e08f926bcd9794acdea9b /include
parent20928bd3f08afb036c096d9559d581926b895918 (diff)
downloadlinux-stable-26794942461f438a6bc725ec7294b08a6bd782c4.tar.gz
linux-stable-26794942461f438a6bc725ec7294b08a6bd782c4.tar.bz2
linux-stable-26794942461f438a6bc725ec7294b08a6bd782c4.zip
mm: Fix generic hugetlb pte check return type.
The include/asm-generic/hugetlb.h stubs that just vector huge_pte_*() calls to the pte_*() implementations won't work in certain situations. x86 and sparc, for example, return "unsigned long" from the bit checks, and just go "return pte_val(pte) & PTE_BIT_FOO;" But since huge_pte_*() returns 'int', if any high bits on 64-bit are relevant, they get chopped off. The net effect is that we can loop forever trying to COW a huge page, because the huge_pte_write() check signals false all the time. Reported-by: Gurudas Pai <gurudas.pai@oracle.com> Tested-by: Gurudas Pai <gurudas.pai@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: David Rientjes <rientjes@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/hugetlb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h
index d06079c774a0..99b490b4d05a 100644
--- a/include/asm-generic/hugetlb.h
+++ b/include/asm-generic/hugetlb.h
@@ -6,12 +6,12 @@ static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
return mk_pte(page, pgprot);
}
-static inline int huge_pte_write(pte_t pte)
+static inline unsigned long huge_pte_write(pte_t pte)
{
return pte_write(pte);
}
-static inline int huge_pte_dirty(pte_t pte)
+static inline unsigned long huge_pte_dirty(pte_t pte)
{
return pte_dirty(pte);
}