diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a986116dabb53d681c6fd2c0de73b0b517700e4d..609986e8b21e07d7a04beba1a7dc56786be07af2 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2073,7 +2073,7 @@ config CPU_SUPPORTS_UNCACHED_ACCELERATED
 	bool
 config MIPS_PGD_C0_CONTEXT
 	bool
-	default y if 64BIT && CPU_MIPSR2 && !CPU_XLP
+	default y if 64BIT && (CPU_MIPSR2 || CPU_MIPSR6) && !CPU_XLP
 
 #
 # Set to y for ptrace access to watch registers.