Browse Source

mm: make the __PAGETABLE_PxD_FOLDED defines non-empty

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>
Martin Schwidefsky 6 years ago
parent
commit
a8874e7e8a

+ 1 - 1
arch/arm/include/asm/pgtable-2level.h

@@ -10,7 +10,7 @@
 #ifndef _ASM_PGTABLE_2LEVEL_H
 #ifndef _ASM_PGTABLE_2LEVEL_H
 #define _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
  * Hardware-wise, we have a two level page table structure, where the first

+ 2 - 2
arch/m68k/include/asm/pgtable_mm.h

@@ -55,12 +55,12 @@
  */
  */
 #ifdef CONFIG_SUN3
 #ifdef CONFIG_SUN3
 #define PTRS_PER_PTE   16
 #define PTRS_PER_PTE   16
-#define __PAGETABLE_PMD_FOLDED
+#define __PAGETABLE_PMD_FOLDED 1
 #define PTRS_PER_PMD   1
 #define PTRS_PER_PMD   1
 #define PTRS_PER_PGD   2048
 #define PTRS_PER_PGD   2048
 #elif defined(CONFIG_COLDFIRE)
 #elif defined(CONFIG_COLDFIRE)
 #define PTRS_PER_PTE	512
 #define PTRS_PER_PTE	512
-#define __PAGETABLE_PMD_FOLDED
+#define __PAGETABLE_PMD_FOLDED 1
 #define PTRS_PER_PMD	1
 #define PTRS_PER_PMD	1
 #define PTRS_PER_PGD	1024
 #define PTRS_PER_PGD	1024
 #else
 #else

+ 1 - 1
arch/microblaze/include/asm/pgtable.h

@@ -63,7 +63,7 @@ extern int mem_init_done;
 
 
 #include <asm-generic/4level-fixup.h>
 #include <asm-generic/4level-fixup.h>
 
 
-#define __PAGETABLE_PMD_FOLDED
+#define __PAGETABLE_PMD_FOLDED 1
 
 
 #ifdef __KERNEL__
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #ifndef __ASSEMBLY__

+ 1 - 1
arch/nds32/include/asm/pgtable.h

@@ -4,7 +4,7 @@
 #ifndef _ASMNDS32_PGTABLE_H
 #ifndef _ASMNDS32_PGTABLE_H
 #define _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/4level-fixup.h>
 #include <asm-generic/sizes.h>
 #include <asm-generic/sizes.h>
 
 

+ 1 - 1
arch/parisc/include/asm/pgtable.h

@@ -111,7 +111,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
 #if CONFIG_PGTABLE_LEVELS == 3
 #if CONFIG_PGTABLE_LEVELS == 3
 #define BITS_PER_PMD	(PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)
 #define BITS_PER_PMD	(PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)
 #else
 #else
-#define __PAGETABLE_PMD_FOLDED
+#define __PAGETABLE_PMD_FOLDED 1
 #define BITS_PER_PMD	0
 #define BITS_PER_PMD	0
 #endif
 #endif
 #define PTRS_PER_PMD    (1UL << BITS_PER_PMD)
 #define PTRS_PER_PMD    (1UL << BITS_PER_PMD)

+ 1 - 1
include/asm-generic/4level-fixup.h

@@ -3,7 +3,7 @@
 #define _4LEVEL_FIXUP_H
 #define _4LEVEL_FIXUP_H
 
 
 #define __ARCH_HAS_4LEVEL_HACK
 #define __ARCH_HAS_4LEVEL_HACK
-#define __PAGETABLE_PUD_FOLDED
+#define __PAGETABLE_PUD_FOLDED 1
 
 
 #define PUD_SHIFT			PGDIR_SHIFT
 #define PUD_SHIFT			PGDIR_SHIFT
 #define PUD_SIZE			PGDIR_SIZE
 #define PUD_SIZE			PGDIR_SIZE

+ 1 - 1
include/asm-generic/5level-fixup.h

@@ -3,7 +3,7 @@
 #define _5LEVEL_FIXUP_H
 #define _5LEVEL_FIXUP_H
 
 
 #define __ARCH_HAS_5LEVEL_HACK
 #define __ARCH_HAS_5LEVEL_HACK
-#define __PAGETABLE_P4D_FOLDED
+#define __PAGETABLE_P4D_FOLDED 1
 
 
 #define P4D_SHIFT			PGDIR_SHIFT
 #define P4D_SHIFT			PGDIR_SHIFT
 #define P4D_SIZE			PGDIR_SIZE
 #define P4D_SIZE			PGDIR_SIZE

+ 1 - 1
include/asm-generic/pgtable-nop4d-hack.h

@@ -5,7 +5,7 @@
 #ifndef __ASSEMBLY__
 #ifndef __ASSEMBLY__
 #include <asm-generic/5level-fixup.h>
 #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
  * Having the pud type consist of a pgd gets the size right, and allows

+ 1 - 1
include/asm-generic/pgtable-nop4d.h

@@ -4,7 +4,7 @@
 
 
 #ifndef __ASSEMBLY__
 #ifndef __ASSEMBLY__
 
 
-#define __PAGETABLE_P4D_FOLDED
+#define __PAGETABLE_P4D_FOLDED 1
 
 
 typedef struct { pgd_t pgd; } p4d_t;
 typedef struct { pgd_t pgd; } p4d_t;
 
 

+ 1 - 1
include/asm-generic/pgtable-nopmd.h

@@ -8,7 +8,7 @@
 
 
 struct mm_struct;
 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
  * Having the pmd type consist of a pud gets the size right, and allows

+ 1 - 1
include/asm-generic/pgtable-nopud.h

@@ -9,7 +9,7 @@
 #else
 #else
 #include <asm-generic/pgtable-nop4d.h>
 #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
  * Having the pud type consist of a p4d gets the size right, and allows