diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /Documentation/filesystems | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 394eb2cc1c39..f566ad9bcb7b 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -2413,6 +2413,8 @@ The following 4 memory types are supported: | |||
| 2413 | - (bit 1) anonymous shared memory | 2413 | - (bit 1) anonymous shared memory |
| 2414 | - (bit 2) file-backed private memory | 2414 | - (bit 2) file-backed private memory |
| 2415 | - (bit 3) file-backed shared memory | 2415 | - (bit 3) file-backed shared memory |
| 2416 | - (bit 4) ELF header pages in file-backed private memory areas (it is | ||
| 2417 | effective only if the bit 2 is cleared) | ||
| 2416 | 2418 | ||
| 2417 | Note that MMIO pages such as frame buffer are never dumped and vDSO pages | 2419 | Note that MMIO pages such as frame buffer are never dumped and vDSO pages |
| 2418 | are always dumped regardless of the bitmask status. | 2420 | are always dumped regardless of the bitmask status. |