Commit fc2a6b83 authored Aug 06, 2020 by Mike Rapoport Committed by Linus Torvalds Aug 07, 2020

opeinrisc: switch to generic version of pte allocation



Replace pte_alloc_one(), pte_free() and pte_free_kernel() with the generic
implementation.  The only actual functional change is the addition of
__GFP_ACCOUT for the allocation of the user page tables.

The pte_alloc_one_kernel() is kept back because its implementation on
openrisc is different than the generic one.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Stafford Horne <shorne@gmail.com>
Cc: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Matthew Wilcox <willy@infradead.org>
Link: http://lkml.kernel.org/r/20200627143453.31835-3-rppt@kernel.org


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ca15ca40

arch/openrisc/include/asm/pgalloc.h

+3 −30

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@
		#include <linux/mm.h>
		#include <linux/memblock.h>

		#define __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL
		#include <asm-generic/pgalloc.h>

		extern int mem_init_done;

		#define pmd_populate_kernel(mm, pmd, pte) \
		@@ -61,38 +64,8 @@ extern inline pgd_t pgd_alloc(struct mm_struct mm)
		}
		#endif

		static inline void pgd_free(struct mm_struct mm, pgd_t pgd)
		{
		free_page((unsigned long)pgd);
		}

		extern pte_t pte_alloc_one_kernel(struct mm_struct mm);

		static inline struct page pte_alloc_one(struct mm_struct mm)
		{
		struct page *pte;
		pte = alloc_pages(GFP_KERNEL, 0);
		if (!pte)
		return NULL;
		clear_page(page_address(pte));
		if (!pgtable_pte_page_ctor(pte)) {
		__free_page(pte);
		return NULL;
		}
		return pte;
		}

		static inline void pte_free_kernel(struct mm_struct mm, pte_t pte)
		{
		free_page((unsigned long)pte);
		}

		static inline void pte_free(struct mm_struct mm, struct page pte)
		{
		pgtable_pte_page_dtor(pte);
		__free_page(pte);
		}

		#define __pte_free_tlb(tlb, pte, addr) \
		do { \
		pgtable_pte_page_dtor(pte); \

Admin message