diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-06-27 23:07:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-06-27 23:07:46 -0400 |
| commit | 30f8f662f911baf3ff80650772384695d83172ec (patch) | |
| tree | b50de238e56724457334ac23cb74d63bf472939b /mm/hugetlb.c | |
| parent | 4c3874d1207a7d51b64f067d0b5e1cb8eb702bc1 (diff) | |
| parent | 937d4f9ee2fe18a6ab012a343fc3b620756b954e (diff) | |
Merge tag 'v3.0.83' into v3.0-rt
This is the 3.0.83 stable release
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 14420ddbc142..a3498eb134be 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2662,7 +2662,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (ptep) { entry = huge_ptep_get(ptep); if (unlikely(is_hugetlb_entry_migration(entry))) { - migration_entry_wait(mm, (pmd_t *)ptep, address); + migration_entry_wait_huge(mm, ptep); return 0; } else if (unlikely(is_hugetlb_entry_hwpoisoned(entry))) return VM_FAULT_HWPOISON_LARGE | |