Index: linux-2.6.19-rc6-mm2/mm/hugetlb.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/mm/hugetlb.c 2006-12-06 18:06:53.000000000 -0600 +++ linux-2.6.19-rc6-mm2/mm/hugetlb.c 2006-12-06 18:46:11.224076672 -0600 @@ -506,7 +506,6 @@ retry: ret = VM_FAULT_OOM; goto out; } - clear_huge_page(page, address); if (vma->vm_flags & VM_SHARED) { int err; @@ -521,6 +520,8 @@ retry: } } else lock_page(page); + + clear_huge_page(page, address); } size = i_size_read(mapping->host) >> HPAGE_SHIFT;