Merge tag 'efi_updates_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / Documentation / arm / memory.rst

diff --git a/Documentation/arm/memory.rst b/Documentation/arm/memory.rst
index 0521b4c..0cb1e29 100644 (file)
--- a/Documentation/arm/memory.rst
+++ b/Documentation/arm/memory.rst
@@ -45,9 +45,14 @@ fffe8000     fffeffff        DTCM mapping area for platforms with
 fffe0000       fffe7fff        ITCM mapping area for platforms with
                                ITCM mounted inside the CPU.
 
-ffc00000       ffefffff        Fixmap mapping region.  Addresses provided
+ffc80000       ffefffff        Fixmap mapping region.  Addresses provided
                                by fix_to_virt() will be located here.
 
+ffc00000       ffc7ffff        Guard region
+
+ff800000       ffbfffff        Permanent, fixed read-only mapping of the
+                               firmware provided DT blob
+
 fee00000       feffffff        Mapping of PCI I/O space. This is a static
                                mapping within the vmalloc space.
 
@@ -72,6 +77,11 @@ MODULES_VADDR        MODULES_END-1   Kernel module space
                                Kernel modules inserted via insmod are
                                placed here using dynamic mappings.
 
+TASK_SIZE      MODULES_VADDR-1 KASAn shadow memory when KASan is in use.
+                               The range from MODULES_VADDR to the top
+                               of the memory is shadowed here with 1 bit
+                               per byte of memory.
+
 00001000       TASK_SIZE-1     User space mappings
                                Per-thread mappings are placed here via
                                the mmap() system call.