From: Kirill A. Shutemov Date: Wed, 11 Feb 2015 23:26:47 +0000 (-0800) Subject: arm: define __PAGETABLE_PMD_FOLDED for !LPAE X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8aa76875dc15b2dd21fa74eb7c12dc3c75f4b6b6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git arm: define __PAGETABLE_PMD_FOLDED for !LPAE ARM uses custom implementation of PMD folding in 2-level page table case. Generic code expects to see __PAGETABLE_PMD_FOLDED to be defined if PMD is folded, but ARM doesn't do this. Let's fix it. Defining __PAGETABLE_PMD_FOLDED will drop out unused __pmd_alloc(). It also fixes problems with recently-introduced pmd accounting on ARM without LPAE. Signed-off-by: Kirill A. Shutemov Reported-by: Nishanth Menon Reported-by: Simon Horman Tested-by: Simon Horman Tested-by: Fabio Estevam Tested-by: Felipe Balbi Tested-by: Nishanth Menon Tested-by: Peter Ujfalusi Tested-by: Krzysztof Kozlowski Tested-by: Geert Uytterhoeven Cc: Dave Hansen Cc: Hugh Dickins Cc: Cyrill Gorcunov Cc: Pavel Emelyanov Cc: David Rientjes Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index bcc5e300413f..bfd662e49a25 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -10,6 +10,8 @@ #ifndef _ASM_PGTABLE_2LEVEL_H #define _ASM_PGTABLE_2LEVEL_H +#define __PAGETABLE_PMD_FOLDED + /* * Hardware-wise, we have a two level page table structure, where the first * level has 4096 entries, and the second level has 256 entries. Each entry