diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-30 11:44:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-30 11:44:27 +0300 |
| commit | 536e0e81e0b04305ce40f6cc4299d29dc9bbc673 (patch) | |
| tree | 1cb7f695bc220bb9cdc5cb9ed1ef005f7771b1fd /mm/huge_memory.c | |
| parent | c1fad9ef7ed14aad464972e6444e7a3bd5670f26 (diff) | |
| parent | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (diff) | |
| download | linux-536e0e81e0b04305ce40f6cc4299d29dc9bbc673.tar.xz | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 4f1a34714b4a..283583fcb1e7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1138,9 +1138,6 @@ int do_huge_pmd_numa_page(struct fault_env *fe, pmd_t pmd) bool was_writable; int flags = 0; - /* A PROT_NONE fault should not end up here */ - BUG_ON(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))); - fe->ptl = pmd_lock(vma->vm_mm, fe->pmd); if (unlikely(!pmd_same(pmd, *fe->pmd))) goto out_unlock; |