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

Commit a32618d2 authored by Russell King's avatar Russell King Committed by Catalin Marinas
Browse files

ARM: pgtable: switch to use pgtable-nopud.h 



Nick Piggin noted upon introducing 4level-fixup.h:

| Add a temporary "fallback" header so architectures can run with
| the 4level pagetables patch without modification. All architectures
| should be converted to use the folding headers (include/asm-generic/
| pgtable-nop?d.h) as soon as possible, and the fallback header removed.

This makes ARM compliant with this statement.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 03a6b827

arch/arm/include/asm/pgalloc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 
 */

 */

#define pmd_alloc_one(mm,addr)		({ BUG(); ((pmd_t *)2); })

#define pmd_alloc_one(mm,addr)		({ BUG(); ((pmd_t *)2); })

#define pmd_free(mm, pmd)		do { } while (0)

#define pmd_free(mm, pmd)		do { } while (0)

#define pgd_populate(mm,pmd,pte)	BUG()

#define pud_populate(mm,pmd,pte)	BUG()





extern pgd_t *pgd_alloc(struct mm_struct *mm);

extern pgd_t *pgd_alloc(struct mm_struct *mm);

extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);

extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);

arch/arm/include/asm/pgtable.h

+13 −10
Original line number Original line Diff line number Diff line
@@ -11,15 +11,16 @@ 
#define _ASMARM_PGTABLE_H

#define _ASMARM_PGTABLE_H





#include <linux/const.h>

#include <linux/const.h>

#include <asm-generic/4level-fixup.h>

#include <asm/proc-fns.h>

#include <asm/proc-fns.h>





#ifndef CONFIG_MMU

#ifndef CONFIG_MMU





#include <asm-generic/4level-fixup.h>

#include "pgtable-nommu.h"

#include "pgtable-nommu.h"





#else

#else





#include <asm-generic/pgtable-nopud.h>

#include <asm/memory.h>

#include <asm/memory.h>

#include <mach/vmalloc.h>

#include <mach/vmalloc.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pgtable-hwdef.h>
@@ -164,20 +165,22 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; 
#define pgd_offset_k(addr)	pgd_offset(&init_mm, addr)

#define pgd_offset_k(addr)	pgd_offset(&init_mm, addr)





/*

/*

 * The "pgd_xxx()" functions here are trivial for a folded two-level

 * The "pud_xxx()" functions here are trivial when the pmd is folded into

 * setup: the pgd is never bad, and a pmd always exists (as it's folded

 * the pud: the pud entry is never bad, always exists, and can't be set or

 * into the pgd entry)

 * cleared.

 */

 */

#define pgd_none(pgd)		(0)

#define pud_none(pud)		(0)

#define pgd_bad(pgd)		(0)

#define pud_bad(pud)		(0)

#define pgd_present(pgd)	(1)

#define pud_present(pud)	(1)

#define pgd_clear(pgdp)		do { } while (0)

#define pud_clear(pudp)		do { } while (0)

#define set_pgd(pgd,pgdp)	do { } while (0)

#define set_pud(pud,pudp)	do { } while (0)

#define set_pud(pud,pudp)	do { } while (0)









/* Find an entry in the second-level page table.. */

/* Find an entry in the second-level page table.. */

#define pmd_offset(dir, addr)	((pmd_t *)(dir))

static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)

{

	return (pmd_t *)pud;

}





#define pmd_none(pmd)		(!pmd_val(pmd))

#define pmd_none(pmd)		(!pmd_val(pmd))

#define pmd_present(pmd)	(pmd_val(pmd))

#define pmd_present(pmd)	(pmd_val(pmd))

arch/arm/include/asm/tlb.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, 




#define pte_free_tlb(tlb, ptep, addr)	__pte_free_tlb(tlb, ptep, addr)

#define pte_free_tlb(tlb, ptep, addr)	__pte_free_tlb(tlb, ptep, addr)

#define pmd_free_tlb(tlb, pmdp, addr)	pmd_free((tlb)->mm, pmdp)

#define pmd_free_tlb(tlb, pmdp, addr)	pmd_free((tlb)->mm, pmdp)

#define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)->mm, pudp)





#define tlb_migrate_finish(mm)		do { } while (0)

#define tlb_migrate_finish(mm)		do { } while (0)