summaryrefslogtreecommitdiff
path: root/Documentation/filesystems/proc.rst
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2024-04-26 12:54:13 +0200
committerJoerg Roedel <jroedel@suse.de>2024-04-26 12:54:13 +0200
commit5dc72c8a146ddcfc568265c8088e90d8e996d340 (patch)
tree0ec46a798323b9c64f896f71493b7d801b92e458 /Documentation/filesystems/proc.rst
parenta4eecd720546527d9c3091231b531e8ca18ba718 (diff)
parent212c5c078d83d780cf2873ca931df135771e8bb7 (diff)
Merge branch 'memory-observability' into x86/amd
Diffstat (limited to 'Documentation/filesystems/proc.rst')
-rw-r--r--Documentation/filesystems/proc.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst
index c6a6b9df2104..707e39280a9a 100644
--- a/Documentation/filesystems/proc.rst
+++ b/Documentation/filesystems/proc.rst
@@ -1110,8 +1110,8 @@ KernelStack
PageTables
Memory consumed by userspace page tables
SecPageTables
- Memory consumed by secondary page tables, this currently
- currently includes KVM mmu allocations on x86 and arm64.
+ Memory consumed by secondary page tables, this currently includes
+ KVM mmu and IOMMU allocations on x86 and arm64.
NFS_Unstable
Always zero. Previous counted pages which had been written to
the server, but has not been committed to stable storage.