diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
| commit | 25d3f1622fdbc73db3f6860961b5fb3035a39f32 (patch) | |
| tree | f4eef88bc0083f282c64c14e81c0ecc95e5f2b43 /arch/powerpc/mm/hash_utils_64.c | |
| parent | dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 706e8a63ced9..a33583f3b0e7 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
| @@ -601,7 +601,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) | |||
| 601 | /* Handle hugepage regions */ | 601 | /* Handle hugepage regions */ |
| 602 | if (unlikely(in_hugepage_area(mm->context, ea))) { | 602 | if (unlikely(in_hugepage_area(mm->context, ea))) { |
| 603 | DBG_LOW(" -> huge page !\n"); | 603 | DBG_LOW(" -> huge page !\n"); |
| 604 | return hash_huge_page(mm, access, ea, vsid, local); | 604 | return hash_huge_page(mm, access, ea, vsid, local, trap); |
| 605 | } | 605 | } |
| 606 | 606 | ||
| 607 | /* Get PTE and page size from page tables */ | 607 | /* Get PTE and page size from page tables */ |