diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
| commit | b4093d6235b7e4249616651ee328600ced48a18a (patch) | |
| tree | 9f5b8e466e2d26fbe13ee7934f9e939a09815bd5 /arch/powerpc/mm/hugetlbpage.c | |
| parent | d9ab77161d811ffb0bccf396f7155cc905c1b9e1 (diff) | |
| parent | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 9920d6a7cf29..c46ef2ffa3d9 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -305,7 +305,7 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud, | |||
| 305 | 305 | ||
| 306 | pmd = pmd_offset(pud, start); | 306 | pmd = pmd_offset(pud, start); |
| 307 | pud_clear(pud); | 307 | pud_clear(pud); |
| 308 | pmd_free_tlb(tlb, pmd); | 308 | pmd_free_tlb(tlb, pmd, start); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, | 311 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, |
| @@ -348,7 +348,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, | |||
| 348 | 348 | ||
| 349 | pud = pud_offset(pgd, start); | 349 | pud = pud_offset(pgd, start); |
| 350 | pgd_clear(pgd); | 350 | pgd_clear(pgd); |
| 351 | pud_free_tlb(tlb, pud); | 351 | pud_free_tlb(tlb, pud, start); |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | /* | 354 | /* |