Index: linux-2.6.19-rc6-mm2/fs/hugetlbfs/inode.c
===================================================================
--- linux-2.6.19-rc6-mm2.orig/fs/hugetlbfs/inode.c	2006-12-04 11:47:30.000000000 -0800
+++ linux-2.6.19-rc6-mm2/fs/hugetlbfs/inode.c	2006-12-04 11:48:01.000000000 -0800
@@ -69,7 +69,7 @@
 	 * when do_mmap_pgoff unwinds (may be important on powerpc and ia64).
 	 */
 	vma->vm_flags |= VM_HUGETLB | VM_RESERVED;
-	vma->vm_ops = &hugetlb_vm_ops;
+	vma->vm_ops = NULL;
 
 	vma_len = (loff_t)(vma->vm_end - vma->vm_start);
 
Index: linux-2.6.19-rc6-mm2/include/linux/hugetlb.h
===================================================================
--- linux-2.6.19-rc6-mm2.orig/include/linux/hugetlb.h	2006-12-04 11:47:30.000000000 -0800
+++ linux-2.6.19-rc6-mm2/include/linux/hugetlb.h	2006-12-04 11:48:01.000000000 -0800
@@ -28,7 +28,6 @@
 void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);
 
 extern unsigned long max_huge_pages;
-extern struct vm_operations_struct hugetlb_vm_ops;
 extern const unsigned long hugetlb_zero, hugetlb_infinity;
 extern int sysctl_hugetlb_shm_group;
 
Index: linux-2.6.19-rc6-mm2/mm/hugetlb.c
===================================================================
--- linux-2.6.19-rc6-mm2.orig/mm/hugetlb.c	2006-12-04 11:47:57.000000000 -0800
+++ linux-2.6.19-rc6-mm2/mm/hugetlb.c	2006-12-04 11:48:01.000000000 -0800
@@ -307,24 +307,6 @@
 	return nr_huge_pages * (HPAGE_SIZE / PAGE_SIZE);
 }
 
-/*
- * We do not need a hugetlb_nopage since there is an explicit
- * check in __handle_mm_fault() calling to hugetlb_fault() if a fault
- * occurs on a huge page vma.
- *
- * This exists only to trap other uses of nopage() (Are there any??)
- */
-static struct page *hugetlb_nopage(struct vm_area_struct *vma,
-				unsigned long address, int *unused)
-{
-	BUG();
-	return NULL;
-}
-
-struct vm_operations_struct hugetlb_vm_ops = {
-	.nopage = hugetlb_nopage,
-};
-
 static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
 				int writable)
 {