include/linux/kdev_t.h: old/new_valid_dev() can return bool

[karo-tx-linux.git] / mm / mincore.c

diff --git a/mm/mincore.c b/mm/mincore.c
index be25efde64a4098c11eb126922a0d20b04bbadce..2a565ed8bb4907398a0d3d2619fd4939df777970 100644 (file)
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -117,7 +117,7 @@ static int mincore_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
        unsigned char *vec = walk->private;
        int nr = (end - addr) >> PAGE_SHIFT;
 
-       if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) {
+       if (pmd_trans_huge_lock(pmd, vma, &ptl)) {
                memset(vec, 1, nr);
                spin_unlock(ptl);
                goto out;
@@ -234,7 +234,7 @@ SYSCALL_DEFINE3(mincore, unsigned long, start, size_t, len,
 
        /* This also avoids any overflows on PAGE_CACHE_ALIGN */
        pages = len >> PAGE_SHIFT;
-       pages += (len & ~PAGE_MASK) != 0;
+       pages += (offset_in_page(len)) != 0;
 
        if (!access_ok(VERIFY_WRITE, vec, pages))
                return -EFAULT;