diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-24 09:19:36 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-24 09:19:36 +0100 |
| commit | 47c564e10f219f867bdb49225972749a43485a47 (patch) | |
| tree | 5e119e0f2e011f422d880d88d1adb2142e508bfc /mm/memory.c | |
| parent | c9c2009a4e915db17f32701d1f0535b400e61b58 (diff) | |
| parent | ba9e358fd04190a59e605c2963a15e014139a707 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index ae8161f1f45..1db40e935e5 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2045,8 +2045,8 @@ 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))) + return hugetlb_fault(mm, vma, address, write_access); /* * We need the page table lock to synchronize with kswapd |