diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:24:45 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:24:45 -0500 |
| commit | b1086eef813ecee09bd6b8ae364acf0fad065cba (patch) | |
| tree | bc723bbdfc2898252e3fd8e14320d7fac58dca4b /arch/powerpc/mm/hash_utils_64.c | |
| parent | 003a20c81ec278595820d3829b544e90919f6f61 (diff) | |
| parent | 49d7bc64283970ee83d2c954d04ba00d04e5943d (diff) | |
Merge branch 'master'
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) /* Handle hugepage regions */ if (unlikely(in_hugepage_area(mm->context, ea))) { DBG_LOW(" -> huge page !\n"); - return hash_huge_page(mm, access, ea, vsid, local); + return hash_huge_page(mm, access, ea, vsid, local, trap); } /* Get PTE and page size from page tables */ |