diff options
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6912bbf33faa..aaa7c1a682d9 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -316,15 +316,14 @@ unsigned long hugetlb_total_pages(void) | |||
316 | * hugegpage VMA. do_page_fault() is supposed to trap this, so BUG is we get | 316 | * hugegpage VMA. do_page_fault() is supposed to trap this, so BUG is we get |
317 | * this far. | 317 | * this far. |
318 | */ | 318 | */ |
319 | static struct page *hugetlb_nopage(struct vm_area_struct *vma, | 319 | static int hugetlb_vm_op_fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
320 | unsigned long address, int *unused) | ||
321 | { | 320 | { |
322 | BUG(); | 321 | BUG(); |
323 | return NULL; | 322 | return 0; |
324 | } | 323 | } |
325 | 324 | ||
326 | struct vm_operations_struct hugetlb_vm_ops = { | 325 | struct vm_operations_struct hugetlb_vm_ops = { |
327 | .nopage = hugetlb_nopage, | 326 | .fault = hugetlb_vm_op_fault, |
328 | }; | 327 | }; |
329 | 328 | ||
330 | static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, | 329 | static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, |