diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index e2520756e005..728d5be9548c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -560,7 +560,7 @@ static void check_mm(struct mm_struct *mm) | |||
| 560 | "mm:%p idx:%d val:%ld\n", mm, i, x); | 560 | "mm:%p idx:%d val:%ld\n", mm, i, x); |
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 563 | #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS |
| 564 | VM_BUG_ON(mm->pmd_huge_pte); | 564 | VM_BUG_ON(mm->pmd_huge_pte); |
| 565 | #endif | 565 | #endif |
| 566 | } | 566 | } |
| @@ -814,7 +814,7 @@ struct mm_struct *dup_mm(struct task_struct *tsk) | |||
| 814 | memcpy(mm, oldmm, sizeof(*mm)); | 814 | memcpy(mm, oldmm, sizeof(*mm)); |
| 815 | mm_init_cpumask(mm); | 815 | mm_init_cpumask(mm); |
| 816 | 816 | ||
| 817 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 817 | #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS |
| 818 | mm->pmd_huge_pte = NULL; | 818 | mm->pmd_huge_pte = NULL; |
| 819 | #endif | 819 | #endif |
| 820 | if (!mm_init(mm, tsk)) | 820 | if (!mm_init(mm, tsk)) |
