1 files changed, 2 insertions, 1 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a4919b0932ec..83980a07dc89 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1542,6 +1542,7 @@ config CPU_XLP
         select WEAK_ORDERING
         select WEAK_REORDERING_BEYOND_LLSC
         select CPU_HAS_PREFETCH
+        select CPU_MIPSR2
         help
           Netlogic Microsystems XLP processors.
 endchoice
@@ -1755,7 +1756,7 @@ config CPU_SUPPORTS_UNCACHED_ACCELERATED
         bool
 config MIPS_PGD_C0_CONTEXT
         bool
-        default y if 64BIT && CPU_MIPSR2
+        default y if 64BIT && CPU_MIPSR2 && !CPU_XLP
 
 #
 # Set to y for ptrace access to watch registers.