diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-23 20:56:59 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-23 20:56:59 -0400 |
| commit | e7d311da9cba1e113f82176130d3af1be77dc3ee (patch) | |
| tree | 05b4baf382124a9a0342777127c09832dcbd88c0 /mm/memory.c | |
| parent | c8e0ca683dfea7242ff29814561dfe761945e5b3 (diff) | |
| parent | ba9e358fd04190a59e605c2963a15e014139a707 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-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 ae8161f1f459..1db40e935e55 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, | |||
| 2045 | 2045 | ||
| 2046 | inc_page_state(pgfault); | 2046 | inc_page_state(pgfault); |
| 2047 | 2047 | ||
| 2048 | if (is_vm_hugetlb_page(vma)) | 2048 | if (unlikely(is_vm_hugetlb_page(vma))) |
| 2049 | return VM_FAULT_SIGBUS; /* mapping truncation does this. */ | 2049 | return hugetlb_fault(mm, vma, address, write_access); |
| 2050 | 2050 | ||
| 2051 | /* | 2051 | /* |
| 2052 | * We need the page table lock to synchronize with kswapd | 2052 | * We need the page table lock to synchronize with kswapd |