diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 64a5de81c425..208a8e67599c 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -25,4 +25,4 @@ implementation.
    ../sh/index
    ../sparc/index
    x86/index
-   ../xtensa/index
+   xtensa/index
diff --git a/Documentation/xtensa/atomctl.rst b/Documentation/arch/xtensa/atomctl.rst
similarity index 100%
rename from Documentation/xtensa/atomctl.rst
rename to Documentation/arch/xtensa/atomctl.rst
diff --git a/Documentation/xtensa/booting.rst b/Documentation/arch/xtensa/booting.rst
similarity index 100%
rename from Documentation/xtensa/booting.rst
rename to Documentation/arch/xtensa/booting.rst
diff --git a/Documentation/xtensa/features.rst b/Documentation/arch/xtensa/features.rst
similarity index 100%
rename from Documentation/xtensa/features.rst
rename to Documentation/arch/xtensa/features.rst
diff --git a/Documentation/xtensa/index.rst b/Documentation/arch/xtensa/index.rst
similarity index 100%
rename from Documentation/xtensa/index.rst
rename to Documentation/arch/xtensa/index.rst
diff --git a/Documentation/xtensa/mmu.rst b/Documentation/arch/xtensa/mmu.rst
similarity index 100%
rename from Documentation/xtensa/mmu.rst
rename to Documentation/arch/xtensa/mmu.rst
diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h
index 9793b49fc641..574795a20d6f 100644
--- a/arch/xtensa/include/asm/initialize_mmu.h
+++ b/arch/xtensa/include/asm/initialize_mmu.h
@@ -43,7 +43,7 @@
 #if XCHAL_HAVE_S32C1I && (XCHAL_HW_MIN_VERSION >= XTENSA_HWVERSION_RC_2009_0)
 /*
  * We Have Atomic Operation Control (ATOMCTL) Register; Initialize it.
- * For details see Documentation/xtensa/atomctl.rst
+ * For details see Documentation/arch/xtensa/atomctl.rst
  */
 #if XCHAL_DCACHE_IS_COHERENT
 	movi	a3, 0x25	/* For SMP/MX -- internal for writeback,