lkml.org 
[lkml]   [2018]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 32/46] mm: make the __PAGETABLE_PxD_FOLDED defines non-empty
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit a8874e7e8a8896f2b6c641f4b8e2473eafd35204 ]

    Change the currently empty defines for __PAGETABLE_PMD_FOLDED,
    __PAGETABLE_PUD_FOLDED and __PAGETABLE_P4D_FOLDED to return 1.
    This makes it possible to use __is_defined() to test if the
    preprocessor define exists.

    Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/include/asm/pgtable-2level.h | 2 +-
    arch/m68k/include/asm/pgtable_mm.h | 4 ++--
    arch/microblaze/include/asm/pgtable.h | 2 +-
    arch/nds32/include/asm/pgtable.h | 2 +-
    arch/parisc/include/asm/pgtable.h | 2 +-
    include/asm-generic/4level-fixup.h | 2 +-
    include/asm-generic/5level-fixup.h | 2 +-
    include/asm-generic/pgtable-nop4d-hack.h | 2 +-
    include/asm-generic/pgtable-nop4d.h | 2 +-
    include/asm-generic/pgtable-nopmd.h | 2 +-
    include/asm-generic/pgtable-nopud.h | 2 +-
    11 files changed, 12 insertions(+), 12 deletions(-)

    diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
    index 92fd2c8a9af0..12659ce5c1f3 100644
    --- a/arch/arm/include/asm/pgtable-2level.h
    +++ b/arch/arm/include/asm/pgtable-2level.h
    @@ -10,7 +10,7 @@
    #ifndef _ASM_PGTABLE_2LEVEL_H
    #define _ASM_PGTABLE_2LEVEL_H

    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1

    /*
    * Hardware-wise, we have a two level page table structure, where the first
    diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h
    index 6181e4134483..fe3ddd73a0cc 100644
    --- a/arch/m68k/include/asm/pgtable_mm.h
    +++ b/arch/m68k/include/asm/pgtable_mm.h
    @@ -55,12 +55,12 @@
    */
    #ifdef CONFIG_SUN3
    #define PTRS_PER_PTE 16
    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1
    #define PTRS_PER_PMD 1
    #define PTRS_PER_PGD 2048
    #elif defined(CONFIG_COLDFIRE)
    #define PTRS_PER_PTE 512
    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1
    #define PTRS_PER_PMD 1
    #define PTRS_PER_PGD 1024
    #else
    diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h
    index 7b650ab14fa0..2ca598534cc7 100644
    --- a/arch/microblaze/include/asm/pgtable.h
    +++ b/arch/microblaze/include/asm/pgtable.h
    @@ -63,7 +63,7 @@ extern int mem_init_done;

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

    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1

    #ifdef __KERNEL__
    #ifndef __ASSEMBLY__
    diff --git a/arch/nds32/include/asm/pgtable.h b/arch/nds32/include/asm/pgtable.h
    index d3e19a55cf53..9f52db930c00 100644
    --- a/arch/nds32/include/asm/pgtable.h
    +++ b/arch/nds32/include/asm/pgtable.h
    @@ -4,7 +4,7 @@
    #ifndef _ASMNDS32_PGTABLE_H
    #define _ASMNDS32_PGTABLE_H

    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1
    #include <asm-generic/4level-fixup.h>
    #include <asm-generic/sizes.h>

    diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
    index fa6b7c78f18a..ff0860b2b21a 100644
    --- a/arch/parisc/include/asm/pgtable.h
    +++ b/arch/parisc/include/asm/pgtable.h
    @@ -117,7 +117,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
    #if CONFIG_PGTABLE_LEVELS == 3
    #define BITS_PER_PMD (PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)
    #else
    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1
    #define BITS_PER_PMD 0
    #endif
    #define PTRS_PER_PMD (1UL << BITS_PER_PMD)
    diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
    index 89f3b03b1445..e3667c9a33a5 100644
    --- a/include/asm-generic/4level-fixup.h
    +++ b/include/asm-generic/4level-fixup.h
    @@ -3,7 +3,7 @@
    #define _4LEVEL_FIXUP_H

    #define __ARCH_HAS_4LEVEL_HACK
    -#define __PAGETABLE_PUD_FOLDED
    +#define __PAGETABLE_PUD_FOLDED 1

    #define PUD_SHIFT PGDIR_SHIFT
    #define PUD_SIZE PGDIR_SIZE
    diff --git a/include/asm-generic/5level-fixup.h b/include/asm-generic/5level-fixup.h
    index 9c2e0708eb82..73474bb52344 100644
    --- a/include/asm-generic/5level-fixup.h
    +++ b/include/asm-generic/5level-fixup.h
    @@ -3,7 +3,7 @@
    #define _5LEVEL_FIXUP_H

    #define __ARCH_HAS_5LEVEL_HACK
    -#define __PAGETABLE_P4D_FOLDED
    +#define __PAGETABLE_P4D_FOLDED 1

    #define P4D_SHIFT PGDIR_SHIFT
    #define P4D_SIZE PGDIR_SIZE
    diff --git a/include/asm-generic/pgtable-nop4d-hack.h b/include/asm-generic/pgtable-nop4d-hack.h
    index 0c34215263b8..1d6dd38c0e5e 100644
    --- a/include/asm-generic/pgtable-nop4d-hack.h
    +++ b/include/asm-generic/pgtable-nop4d-hack.h
    @@ -5,7 +5,7 @@
    #ifndef __ASSEMBLY__
    #include <asm-generic/5level-fixup.h>

    -#define __PAGETABLE_PUD_FOLDED
    +#define __PAGETABLE_PUD_FOLDED 1

    /*
    * Having the pud type consist of a pgd gets the size right, and allows
    diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h
    index 1a29b2a0282b..04cb913797bc 100644
    --- a/include/asm-generic/pgtable-nop4d.h
    +++ b/include/asm-generic/pgtable-nop4d.h
    @@ -4,7 +4,7 @@

    #ifndef __ASSEMBLY__

    -#define __PAGETABLE_P4D_FOLDED
    +#define __PAGETABLE_P4D_FOLDED 1

    typedef struct { pgd_t pgd; } p4d_t;

    diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
    index f35f6e8149e4..b85b8271a73d 100644
    --- a/include/asm-generic/pgtable-nopmd.h
    +++ b/include/asm-generic/pgtable-nopmd.h
    @@ -8,7 +8,7 @@

    struct mm_struct;

    -#define __PAGETABLE_PMD_FOLDED
    +#define __PAGETABLE_PMD_FOLDED 1

    /*
    * Having the pmd type consist of a pud gets the size right, and allows
    diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
    index e950b9c50f34..9bef475db6fe 100644
    --- a/include/asm-generic/pgtable-nopud.h
    +++ b/include/asm-generic/pgtable-nopud.h
    @@ -9,7 +9,7 @@
    #else
    #include <asm-generic/pgtable-nop4d.h>

    -#define __PAGETABLE_PUD_FOLDED
    +#define __PAGETABLE_PUD_FOLDED 1

    /*
    * Having the pud type consist of a p4d gets the size right, and allows
    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-28 13:24    [W:4.169 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site