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

Commit 75a9b8a6 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: Copy pgalloc (part 2) 



This moves the nohash variant of pgalloc headers to nohash/ directory

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 101ad5c6

arch/powerpc/include/asm/book3s/32/pgalloc.h

+3 −3
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_PGALLOC_32_H

#define _ASM_POWERPC_PGALLOC_32_H

#ifndef _ASM_POWERPC_BOOK3S_32_PGALLOC_H

#define _ASM_POWERPC_BOOK3S_32_PGALLOC_H



#include <linux/threads.h>
@@ -106,4 +106,4 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, 
	pgtable_page_dtor(table);

	pgtable_free_tlb(tlb, page_address(table), 0);

}

#endif /* _ASM_POWERPC_PGALLOC_32_H */
 
#endif /* _ASM_POWERPC_BOOK3S_32_PGALLOC_H */

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

+11 −6
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_PGALLOC_64_H

#define _ASM_POWERPC_PGALLOC_64_H

#ifndef _ASM_POWERPC_BOOK3S_64_PGALLOC_H

#define _ASM_POWERPC_BOOK3S_64_PGALLOC_H

/*

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -52,8 +52,10 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) 
}



#ifndef CONFIG_PPC_64K_PAGES



#define pgd_populate(MM, PGD, PUD)	pgd_set(PGD, __pgtable_ptr_val(PUD))

static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)

{

	pgd_set(pgd, __pgtable_ptr_val(pud));

}



static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)

{
@@ -83,7 +85,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 
	pmd_set(pmd, __pgtable_ptr_val(page_address(pte_page)));

}



#define pmd_pgtable(pmd) pmd_page(pmd)

static inline pgtable_t pmd_pgtable(pmd_t pmd)

{

	return pmd_page(pmd);

}



static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,

					  unsigned long address)
@@ -263,4 +268,4 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) 


#define check_pgt_cache()	do { } while (0)



#endif /* _ASM_POWERPC_PGALLOC_64_H */
 
#endif /* _ASM_POWERPC_BOOK3S_64_PGALLOC_H */

arch/powerpc/include/asm/book3s/pgalloc.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_BOOK3S_PGALLOC_H

#define _ASM_POWERPC_BOOK3S_PGALLOC_H



#include <linux/mm.h>



extern void tlb_remove_table(struct mmu_gather *tlb, void *table);

static inline void tlb_flush_pgtable(struct mmu_gather *tlb,

				     unsigned long address)

{



}



#ifdef CONFIG_PPC64

#include <asm/book3s/64/pgalloc.h>

#else

#include <asm/book3s/32/pgalloc.h>

#endif



#endif /* _ASM_POWERPC_BOOK3S_PGALLOC_H */