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

Commit e81f2d22 authored by Zhang Zhen's avatar Zhang Zhen Committed by Linus Torvalds
Browse files

mm/hugetlb: reduce arch dependent code about huge_pmd_unshare 



Currently we have many duplicates in definitions of huge_pmd_unshare.  In
all architectures this function just returns 0 when
CONFIG_ARCH_WANT_HUGE_PMD_SHARE is N.

This patch puts the default implementation in mm/hugetlb.c and lets these
architectures use the common code.

Signed-off-by: default avatarZhang Zhen <zhenzhang.zhang@huawei.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: David Rientjes <rientjes@google.com>
Cc: James Yang <James.Yang@freescale.com>
Cc: Aneesh Kumar <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36f88188

arch/arm/mm/hugetlbpage.c

+0 −5
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ int pud_huge(pud_t pud) 
	return 0;

}



int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)

{

	return 0;

}



int pmd_huge(pmd_t pmd)

{

	return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);

arch/arm64/mm/hugetlbpage.c

+0 −7
Original line number Diff line number Diff line
@@ -31,13 +31,6 @@ 
#include <asm/tlbflush.h>

#include <asm/pgalloc.h>



#ifndef CONFIG_ARCH_WANT_HUGE_PMD_SHARE

int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)

{

	return 0;

}

#endif



int pmd_huge(pmd_t pmd)

{

	return !(pmd_val(pmd) & PMD_TABLE_BIT);

arch/ia64/mm/hugetlbpage.c

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ huge_pte_offset (struct mm_struct *mm, unsigned long addr) 
	return pte;

}



int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)

{

	return 0;

}



#define mk_pte_huge(entry) { pte_val(entry) |= _PAGE_P; }



/*

arch/metag/mm/hugetlbpage.c

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) 
	return pte;

}



int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)

{

	return 0;

}



int pmd_huge(pmd_t pmd)

{

	return pmd_page_shift(pmd) > PAGE_SHIFT;

arch/mips/mm/hugetlbpage.c

+0 −5
Original line number Diff line number Diff line
@@ -51,11 +51,6 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) 
	return (pte_t *) pmd;

}



int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)

{

	return 0;

}



/*

 * This function checks for proper alignment of input addr and len parameters.

 */