Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Wende Tan <twd2.me@gmail.com>
To:     geert@linux-m68k.org, linux-m68k@lists.linux-m68k.org
Cc:     Wende Tan <twd2.me@gmail.com>, linux-kernel@vger.kernel.org,
        lkp@intel.com
Subject: [PATCH] m68k: Remove redefinitions of `PMD_SIZE`, `PMD_MASK`, etc.
Date:   Wed, 21 Jul 2021 10:43:18 +0000
Message-Id: <20210721104318.1070133-1-twd2.me@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Remove redefinitions of `PMD_SIZE`, `PMD_MASK`, `PTRS_PER_PMD`,
and `__PAGETABLE_PMD_FOLDED` when PGTABLE_LEVELS == 2 (i.e. SUN3 ||
COLDFIRE).  They have already been defined in
`asm-generic/pgtable-nopmd.h`.

See also https://lore.kernel.org/lkml/202107201907.lqC6B3dF-lkp@intel.com/#t

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Wende Tan <twd2.me@gmail.com>
---
 arch/m68k/include/asm/pgtable_mm.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h
index 143ba7de9bda..51653e8216a7 100644
--- a/arch/m68k/include/asm/pgtable_mm.h
+++ b/arch/m68k/include/asm/pgtable_mm.h
@@ -37,9 +37,9 @@
 /* PMD_SHIFT determines the size of the area a second-level page table can map */
 #if CONFIG_PGTABLE_LEVELS == 3
 #define PMD_SHIFT	18
-#endif
 #define PMD_SIZE	(1UL << PMD_SHIFT)
 #define PMD_MASK	(~(PMD_SIZE-1))
+#endif
 
 /* PGDIR_SHIFT determines what a third-level page table entry can map */
 #ifdef CONFIG_SUN3
@@ -58,13 +58,9 @@
  */
 #ifdef CONFIG_SUN3
 #define PTRS_PER_PTE   16
-#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 1
-#define PTRS_PER_PMD	1
 #define PTRS_PER_PGD	1024
 #else
 #define PTRS_PER_PTE	64
-- 
2.25.1