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

Commit e4e40e02 authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds
Browse files

mm: switch to 'define pmd_write' instead of __HAVE_ARCH_PMD_WRITE 

In response to compile breakage introduced by a series that added the
pud_write helper to x86, Stephen notes:

    did you consider using the other paradigm:

    In arch include files:
    #define pud_write       pud_write
    static inline int pud_write(pud_t pud)
     .....

    Then in include/asm-generic/pgtable.h:

    #ifndef pud_write
    tatic inline int pud_write(pud_t pud)
    {
            ....
    }
    #endif

    If you had, then the powerpc code would have worked ... ;-) and many
    of the other interfaces in include/asm-generic/pgtable.h are
    protected that way ...

Given that some architecture already define pmd_write() as a macro, it's
a net reduction to drop the definition of __HAVE_ARCH_PMD_WRITE.

Link: http://lkml.kernel.org/r/151129126721.37405.13339850900081557813.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Suggested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1501899a

arch/arm/include/asm/pgtable-3level.h

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static inline pte_t pte_mkspecial(pte_t pte) 
}

#define	__HAVE_ARCH_PTE_SPECIAL



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		(pmd_isclear((pmd), L_PMD_SECT_RDONLY))

#define pmd_dirty(pmd)		(pmd_isset((pmd), L_PMD_SECT_DIRTY))

#define pud_page(pud)		pmd_page(__pmd(pud_val(pud)))

arch/arm64/include/asm/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ static inline int pmd_protnone(pmd_t pmd) 


#define pmd_thp_or_huge(pmd)	(pmd_huge(pmd) || pmd_trans_huge(pmd))



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		pte_write(pmd_pte(pmd))



#define pmd_mkhuge(pmd)		(__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))

arch/mips/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd) 
extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,

		       pmd_t *pmdp, pmd_t pmd);



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write pmd_write

static inline int pmd_write(pmd_t pmd)

{

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

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,6 @@ static inline int pmd_protnone(pmd_t pmd) 
}

#endif /* CONFIG_NUMA_BALANCING */



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		pte_write(pmd_pte(pmd))

#define __pmd_write(pmd)	__pte_write(pmd_pte(pmd))

#define pmd_savedwrite(pmd)	pte_savedwrite(pmd_pte(pmd))

arch/s390/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd) 
	return (pmd_val(pmd) & origin_mask) >> PAGE_SHIFT;

}



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write pmd_write

static inline int pmd_write(pmd_t pmd)

{

	return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0;