diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 15:34:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 15:34:27 -0400 |
commit | eeee3149aaa022145b2659e3b0601dc705d69402 (patch) | |
tree | 1b537cccc059cab62d7d2e22b7583b192d9e8c15 /Documentation/filesystems | |
parent | c5e7a7ea22d5677f7c70028908372cff6948ecdc (diff) | |
parent | a49d9c0ae46e149a22aefa8251d07dddd5611851 (diff) |
Merge tag 'docs-4.18' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"There's been a fair amount of work in the docs tree this time around,
including:
- Extensive RST conversions and organizational work in the
memory-management docs thanks to Mike Rapoport.
- An update of Documentation/features from Andrea Parri and a script
to keep it updated.
- Various LICENSES updates from Thomas, along with a script to check
SPDX tags.
- Work to fix dangling references to documentation files; this
involved a fair number of one-liner comment changes outside of
Documentation/
... and the usual list of documentation improvements, typo fixes, etc"
* tag 'docs-4.18' of git://git.lwn.net/linux: (103 commits)
Documentation: document hung_task_panic kernel parameter
docs/admin-guide/mm: add high level concepts overview
docs/vm: move ksm and transhuge from "user" to "internals" section.
docs: Use the kerneldoc comments for memalloc_no*()
doc: document scope NOFS, NOIO APIs
docs: update kernel versions and dates in tables
docs/vm: transhuge: split userspace bits to admin-guide/mm/transhuge
docs/vm: transhuge: minor updates
docs/vm: transhuge: change sections order
Documentation: arm: clean up Marvell Berlin family info
Documentation: gpio: driver: Fix a typo and some odd grammar
docs: ranoops.rst: fix location of ramoops.txt
scripts/documentation-file-ref-check: rewrite it in perl with auto-fix mode
docs: uio-howto.rst: use a code block to solve a warning
mm, THP, doc: Add document for thp_swpout/thp_swpout_fallback
w1: w1_io.c: fix a kernel-doc warning
Documentation/process/posting: wrap text at 80 cols
docs: admin-guide: add cgroup-v2 documentation
Revert "Documentation/features/vm: Remove arch support status file for 'pte_special'"
Documentation: refcount-vs-atomic: Update reference to LKMM doc.
...
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/proc.txt | 8 | ||||
-rw-r--r-- | Documentation/filesystems/tmpfs.txt | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 2a84bb334894..520f6a84cf50 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -515,7 +515,8 @@ guarantees: | |||
515 | 515 | ||
516 | The /proc/PID/clear_refs is used to reset the PG_Referenced and ACCESSED/YOUNG | 516 | The /proc/PID/clear_refs is used to reset the PG_Referenced and ACCESSED/YOUNG |
517 | bits on both physical and virtual pages associated with a process, and the | 517 | bits on both physical and virtual pages associated with a process, and the |
518 | soft-dirty bit on pte (see Documentation/vm/soft-dirty.txt for details). | 518 | soft-dirty bit on pte (see Documentation/admin-guide/mm/soft-dirty.rst |
519 | for details). | ||
519 | To clear the bits for all the pages associated with the process | 520 | To clear the bits for all the pages associated with the process |
520 | > echo 1 > /proc/PID/clear_refs | 521 | > echo 1 > /proc/PID/clear_refs |
521 | 522 | ||
@@ -536,7 +537,8 @@ Any other value written to /proc/PID/clear_refs will have no effect. | |||
536 | 537 | ||
537 | The /proc/pid/pagemap gives the PFN, which can be used to find the pageflags | 538 | The /proc/pid/pagemap gives the PFN, which can be used to find the pageflags |
538 | using /proc/kpageflags and number of times a page is mapped using | 539 | using /proc/kpageflags and number of times a page is mapped using |
539 | /proc/kpagecount. For detailed explanation, see Documentation/vm/pagemap.txt. | 540 | /proc/kpagecount. For detailed explanation, see |
541 | Documentation/admin-guide/mm/pagemap.rst. | ||
540 | 542 | ||
541 | The /proc/pid/numa_maps is an extension based on maps, showing the memory | 543 | The /proc/pid/numa_maps is an extension based on maps, showing the memory |
542 | locality and binding policy, as well as the memory usage (in pages) of | 544 | locality and binding policy, as well as the memory usage (in pages) of |
@@ -564,7 +566,7 @@ address policy mapping details | |||
564 | 566 | ||
565 | Where: | 567 | Where: |
566 | "address" is the starting address for the mapping; | 568 | "address" is the starting address for the mapping; |
567 | "policy" reports the NUMA memory policy set for the mapping (see vm/numa_memory_policy.txt); | 569 | "policy" reports the NUMA memory policy set for the mapping (see Documentation/admin-guide/mm/numa_memory_policy.rst); |
568 | "mapping details" summarizes mapping data such as mapping type, page usage counters, | 570 | "mapping details" summarizes mapping data such as mapping type, page usage counters, |
569 | node locality page counters (N0 == node0, N1 == node1, ...) and the kernel page | 571 | node locality page counters (N0 == node0, N1 == node1, ...) and the kernel page |
570 | size, in KB, that is backing the mapping up. | 572 | size, in KB, that is backing the mapping up. |
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index a85355cf85f4..d06e9a59a9f4 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt | |||
@@ -105,8 +105,9 @@ policy for the file will revert to "default" policy. | |||
105 | NUMA memory allocation policies have optional flags that can be used in | 105 | NUMA memory allocation policies have optional flags that can be used in |
106 | conjunction with their modes. These optional flags can be specified | 106 | conjunction with their modes. These optional flags can be specified |
107 | when tmpfs is mounted by appending them to the mode before the NodeList. | 107 | when tmpfs is mounted by appending them to the mode before the NodeList. |
108 | See Documentation/vm/numa_memory_policy.txt for a list of all available | 108 | See Documentation/admin-guide/mm/numa_memory_policy.rst for a list of |
109 | memory allocation policy mode flags and their effect on memory policy. | 109 | all available memory allocation policy mode flags and their effect on |
110 | memory policy. | ||
110 | 111 | ||
111 | =static is equivalent to MPOL_F_STATIC_NODES | 112 | =static is equivalent to MPOL_F_STATIC_NODES |
112 | =relative is equivalent to MPOL_F_RELATIVE_NODES | 113 | =relative is equivalent to MPOL_F_RELATIVE_NODES |