diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-21 10:42:58 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-21 10:42:58 -0700 |
| commit | ab27642b59b68d18df5a9aa5fa81b5ab5735aa77 (patch) | |
| tree | afc2f191ef73e6eb1064de6358f44177d691aab0 /mm/memory.c | |
| parent | ba9b543d5bec0a7605952e2ba501fb8b0f3b6407 (diff) | |
| parent | 654b1536b0927d189526b9063818e0790aa3ea23 (diff) | |
Merge branch 'master' of ssh://rsync.linux-nfs.org/home/trondmy/www_sites/rsync.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index ae8161f1f45..8c88b973abc 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2045,8 +2045,18 @@ int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct * vma, inc_page_state(pgfault); - if (is_vm_hugetlb_page(vma)) - return VM_FAULT_SIGBUS; /* mapping truncation does this. */ + if (unlikely(is_vm_hugetlb_page(vma))) { + if (valid_hugetlb_file_off(vma, address)) + /* We get here only if there was a stale(zero) TLB entry + * (because of HW prefetching). + * Low-level arch code (if needed) should have already + * purged the stale entry as part of this fault handling. + * Here we just return. + */ + return VM_FAULT_MINOR; + else + return VM_FAULT_SIGBUS; /* mapping truncation does this. */ + } /* * We need the page table lock to synchronize with kswapd |