diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-03-12 22:55:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-03-12 22:55:39 -0700 |
| commit | bb8236f2b978e8ed84e8b664882905fb5a7dd6c8 (patch) | |
| tree | a7189be418ef263616c8b5601912e9d76ca23e62 /arch/sparc64/mm | |
| parent | 50d266a3a1b6a284aed7e06b599668ec23b28d6f (diff) | |
| download | kernel_samsung_aries-bb8236f2b978e8ed84e8b664882905fb5a7dd6c8.zip kernel_samsung_aries-bb8236f2b978e8ed84e8b664882905fb5a7dd6c8.tar.gz kernel_samsung_aries-bb8236f2b978e8ed84e8b664882905fb5a7dd6c8.tar.bz2 | |
[SPARC64]: Add missing HPAGE_MASK masks on address parameters.
These pte loops all assume the passed in address is HPAGE
aligned, make sure that is actually true.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/mm')
| -rw-r--r-- | arch/sparc64/mm/hugetlbpage.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c index 33fd0b2..00677b5 100644 --- a/arch/sparc64/mm/hugetlbpage.c +++ b/arch/sparc64/mm/hugetlbpage.c @@ -248,6 +248,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, if (!pte_present(*ptep) && pte_present(entry)) mm->context.huge_pte_count++; + addr &= HPAGE_MASK; for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) { set_pte_at(mm, addr, ptep, entry); ptep++; @@ -266,6 +267,8 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, if (pte_present(entry)) mm->context.huge_pte_count--; + addr &= HPAGE_MASK; + for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) { pte_clear(mm, addr, ptep); addr += PAGE_SIZE; |