Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / mm / gup.c

diff --git a/mm/gup.c b/mm/gup.c
index 43b7d875de3716fb20353fb732ddcc531b5f2b54..8bbaa5523116719038ce2ace262330e36f6209f3 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -609,13 +609,6 @@ static int get_gate_page(struct mm_struct *mm, unsigned long address,
                if ((gup_flags & FOLL_DUMP) || !is_zero_pfn(pte_pfn(*pte)))
                        goto unmap;
                *page = pte_page(*pte);
-
-               /*
-                * This should never happen (a device public page in the gate
-                * area).
-                */
-               if (is_device_public_page(*page))
-                       goto unmap;
        }
        if (unlikely(!try_get_page(*page))) {
                ret = -ENOMEM;