Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42b77728 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

mm: remove double indirection on tlb parameter to free_pgd_range() & Co 



The double indirection here is not needed anywhere and hence (at least)
confusing.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: default avatarJeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a352894d

arch/ia64/mm/hugetlbpage.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int wri 
	return NULL;

	return NULL;

}

}





void hugetlb_free_pgd_range(struct mmu_gather **tlb,

void hugetlb_free_pgd_range(struct mmu_gather *tlb,

			unsigned long addr, unsigned long end,

			unsigned long addr, unsigned long end,

			unsigned long floor, unsigned long ceiling)

			unsigned long floor, unsigned long ceiling)

{

{

arch/powerpc/mm/hugetlbpage.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, 
 *

 *

 * Must be called with pagetable lock held.

 * Must be called with pagetable lock held.

 */

 */

void hugetlb_free_pgd_range(struct mmu_gather **tlb,

void hugetlb_free_pgd_range(struct mmu_gather *tlb,

			    unsigned long addr, unsigned long end,

			    unsigned long addr, unsigned long end,

			    unsigned long floor, unsigned long ceiling)

			    unsigned long floor, unsigned long ceiling)

{

{
@@ -315,13 +315,13 @@ void hugetlb_free_pgd_range(struct mmu_gather **tlb, 
		return;

		return;





	start = addr;

	start = addr;

	pgd = pgd_offset((*tlb)->mm, addr);

	pgd = pgd_offset(tlb->mm, addr);

	do {

	do {

		BUG_ON(get_slice_psize((*tlb)->mm, addr) != mmu_huge_psize);

		BUG_ON(get_slice_psize(tlb->mm, addr) != mmu_huge_psize);

		next = pgd_addr_end(addr, end);

		next = pgd_addr_end(addr, end);

		if (pgd_none_or_clear_bad(pgd))

		if (pgd_none_or_clear_bad(pgd))

			continue;

			continue;

		hugetlb_free_pud_range(*tlb, pgd, addr, next, floor, ceiling);

		hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);

	} while (pgd++, addr = next, addr != end);

	} while (pgd++, addr = next, addr != end);

}

}

fs/exec.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -541,7 +541,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) 
		/*

		/*

		 * when the old and new regions overlap clear from new_end.

		 * when the old and new regions overlap clear from new_end.

		 */

		 */

		free_pgd_range(&tlb, new_end, old_end, new_end,

		free_pgd_range(tlb, new_end, old_end, new_end,

			vma->vm_next ? vma->vm_next->vm_start : 0);

			vma->vm_next ? vma->vm_next->vm_start : 0);

	} else {

	} else {

		/*

		/*
@@ -550,7 +550,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) 
		 * have constraints on va-space that make this illegal (IA64) -

		 * have constraints on va-space that make this illegal (IA64) -

		 * for the others its just a little faster.

		 * for the others its just a little faster.

		 */

		 */

		free_pgd_range(&tlb, old_start, old_end, new_end,

		free_pgd_range(tlb, old_start, old_end, new_end,

			vma->vm_next ? vma->vm_next->vm_start : 0);

			vma->vm_next ? vma->vm_next->vm_start : 0);

	}

	}

	tlb_finish_mmu(tlb, new_end, old_end);

	tlb_finish_mmu(tlb, new_end, old_end);

include/asm-ia64/hugetlb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <asm/page.h>

#include <asm/page.h>









void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,

void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,

			    unsigned long end, unsigned long floor,

			    unsigned long end, unsigned long floor,

			    unsigned long ceiling);

			    unsigned long ceiling);

include/asm-powerpc/hugetlb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,

int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,

			   unsigned long len);

			   unsigned long len);





void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,

void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,

			    unsigned long end, unsigned long floor,

			    unsigned long end, unsigned long floor,

			    unsigned long ceiling);

			    unsigned long ceiling);