From: Alex Shi <alexs@xxxxxxxxxx> Since the contents is mainly focus on a sysctl vm.overcommit_memory, it's more suitable for admin-guide dir instead of mm/ dir. Signed-off-by: Alex Shi <alexs@xxxxxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: linux-doc@xxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx --- Documentation/admin-guide/mm/index.rst | 1 + Documentation/{ => admin-guide}/mm/overcommit-accounting.rst | 0 Documentation/admin-guide/sysctl/vm.rst | 2 +- Documentation/filesystems/proc.rst | 2 +- Documentation/mm/index.rst | 1 - Documentation/translations/zh_CN/admin-guide/mm/index.rst | 1 + .../zh_CN/{ => admin-guide}/mm/overcommit-accounting.rst | 2 +- Documentation/translations/zh_CN/mm/index.rst | 1 - 8 files changed, 5 insertions(+), 5 deletions(-) rename Documentation/{ => admin-guide}/mm/overcommit-accounting.rst (100%) rename Documentation/translations/zh_CN/{ => admin-guide}/mm/overcommit-accounting.rst (97%) diff --git a/Documentation/admin-guide/mm/index.rst b/Documentation/admin-guide/mm/index.rst index 1bd11118dfb1..9aea816493a5 100644 --- a/Documentation/admin-guide/mm/index.rst +++ b/Documentation/admin-guide/mm/index.rst @@ -35,6 +35,7 @@ the Linux memory management. nommu-mmap numa_memory_policy numaperf + overcommit-accounting pagemap shrinker_debugfs soft-dirty diff --git a/Documentation/mm/overcommit-accounting.rst b/Documentation/admin-guide/mm/overcommit-accounting.rst similarity index 100% rename from Documentation/mm/overcommit-accounting.rst rename to Documentation/admin-guide/mm/overcommit-accounting.rst diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst index 9b833e439f09..ec611b8c620c 100644 --- a/Documentation/admin-guide/sysctl/vm.rst +++ b/Documentation/admin-guide/sysctl/vm.rst @@ -758,7 +758,7 @@ and don't use much of it. The default value is 0. -See Documentation/mm/overcommit-accounting.rst and +See Documentation/admin-guide/mm/overcommit-accounting.rst and mm/util.c::__vm_enough_memory() for more information. diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 47e95dbc820d..0ed8c9777d8c 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -1114,7 +1114,7 @@ CommitLimit yield a CommitLimit of 7.3G. For more details, see the memory overcommit documentation - in mm/overcommit-accounting. + in admin-guide/mm/overcommit-accounting. Committed_AS The amount of memory presently allocated on the system. The committed memory is a sum of all of the memory which diff --git a/Documentation/mm/index.rst b/Documentation/mm/index.rst index 575ccd40e30c..e5ba30c89552 100644 --- a/Documentation/mm/index.rst +++ b/Documentation/mm/index.rst @@ -52,7 +52,6 @@ above structured documentation, or deleted if it has served its purpose. memory-model mmu_notifier numa - overcommit-accounting page_migration page_frags page_owner diff --git a/Documentation/translations/zh_CN/admin-guide/mm/index.rst b/Documentation/translations/zh_CN/admin-guide/mm/index.rst index 702271c5b683..7304924d8131 100644 --- a/Documentation/translations/zh_CN/admin-guide/mm/index.rst +++ b/Documentation/translations/zh_CN/admin-guide/mm/index.rst @@ -31,6 +31,7 @@ Linux内存管理有它自己的术语,如果你还不熟悉它,请考虑阅 damon/index ksm + overcommit-accounting Todolist: * concepts diff --git a/Documentation/translations/zh_CN/mm/overcommit-accounting.rst b/Documentation/translations/zh_CN/admin-guide/mm/overcommit-accounting.rst similarity index 97% rename from Documentation/translations/zh_CN/mm/overcommit-accounting.rst rename to Documentation/translations/zh_CN/admin-guide/mm/overcommit-accounting.rst index d8452d8b7fbb..04b6067d711d 100644 --- a/Documentation/translations/zh_CN/mm/overcommit-accounting.rst +++ b/Documentation/translations/zh_CN/admin-guide/mm/overcommit-accounting.rst @@ -1,4 +1,4 @@ -:Original: Documentation/mm/overcommit-accounting.rst +:Original: Documentation/admin-guide/mm/overcommit-accounting.rst :翻译: diff --git a/Documentation/translations/zh_CN/mm/index.rst b/Documentation/translations/zh_CN/mm/index.rst index 2f53e37b8049..3d603c90364c 100644 --- a/Documentation/translations/zh_CN/mm/index.rst +++ b/Documentation/translations/zh_CN/mm/index.rst @@ -49,7 +49,6 @@ Linux内存管理文档 memory-model mmu_notifier numa - overcommit-accounting page_frags page_migration page_owner -- 2.25.1