diff options
author | David S. Miller <davem@davemloft.net> | 2014-01-14 14:37:09 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-14 14:42:42 -0800 |
commit | 0a379e21c503b2ff66b44d588df9f231e9b0b9ca (patch) | |
tree | 22b875fcf4b67fcd007726f00c5fc1748ce985d0 /mm/huge_memory.c | |
parent | Merge branch 'skb_checksum_help' (diff) | |
parent | net: usbnet: fix SG initialisation (diff) | |
download | linux-dev-0a379e21c503b2ff66b44d588df9f231e9b0b9ca.tar.xz linux-dev-0a379e21c503b2ff66b44d588df9f231e9b0b9ca.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r-- | mm/huge_memory.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 7de1bf85f683..9c0b17295ba0 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -883,9 +883,6 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, goto out_unlock; } - /* mmap_sem prevents this happening but warn if that changes */ - WARN_ON(pmd_trans_migrating(pmd)); - if (unlikely(pmd_trans_splitting(pmd))) { /* split huge page running from under us */ spin_unlock(src_ptl); |