From 9a141bfb1f4d23fe5eb4bea3c0dd7455d5c667c2 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Sun, 5 Jan 2014 11:00:31 +1300 Subject: [PATCH] get_mempolicy.2, mbind.2, mlock.2, set_mempolicy.2, bootparam.7, packet.7: grfix: s/memory mapped/memory-mapped/ when used attributively Signed-off-by: Michael Kerrisk --- man2/get_mempolicy.2 | 2 +- man2/mbind.2 | 4 ++-- man2/mlock.2 | 2 +- man2/set_mempolicy.2 | 4 ++-- man7/bootparam.7 | 4 ++-- man7/packet.7 | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/man2/get_mempolicy.2 b/man2/get_mempolicy.2 index 4b713f9d5..a17c0f319 100644 --- a/man2/get_mempolicy.2 +++ b/man2/get_mempolicy.2 @@ -155,7 +155,7 @@ argument, the node ID of the next node that will be used for interleaving of internal kernel pages allocated on behalf of the process. .\" Note: code returns next interleave node via 'mode' argument -Lee Schermerhorn -These allocations include pages for memory mapped files in +These allocations include pages for memory-mapped files in process memory ranges mapped using the .BR mmap (2) call with the diff --git a/man2/mbind.2 b/man2/mbind.2 index ded226f0f..21e0b22a5 100644 --- a/man2/mbind.2 +++ b/man2/mbind.2 @@ -73,7 +73,7 @@ a region of memory created using the .BR mmap (2) system call with the .BR MAP_ANONYMOUS \(emor -a memory mapped file, mapped using the +a memory-mapped file, mapped using the .BR mmap (2) system call with the .B MAP_PRIVATE @@ -406,7 +406,7 @@ This system call is Linux-specific. For information on library support, see .BR numa (7). -NUMA policy is not supported on a memory mapped file range +NUMA policy is not supported on a memory-mapped file range that was mapped with the .B MAP_SHARED flag. diff --git a/man2/mlock.2 b/man2/mlock.2 index dbc385bb8..f1d6af8f5 100644 --- a/man2/mlock.2 +++ b/man2/mlock.2 @@ -94,7 +94,7 @@ the process. Lock all pages which will become mapped into the address space of the process in the future. These could be for instance new pages required -by a growing heap and stack as well as new memory mapped files or +by a growing heap and stack as well as new memory-mapped files or shared memory regions. .PP If diff --git a/man2/set_mempolicy.2 b/man2/set_mempolicy.2 index 4dd9c9e32..23572e9bb 100644 --- a/man2/set_mempolicy.2 +++ b/man2/set_mempolicy.2 @@ -58,12 +58,12 @@ address space outside of memory ranges controlled by a more specific policy set by .BR mbind (2). The process default policy also controls allocation of any pages for -memory mapped files mapped using the +memory-mapped files mapped using the .BR mmap (2) call with the .B MAP_PRIVATE flag and that are only read [loaded] from by the process -and of memory mapped files mapped using the +and of memory-mapped files mapped using the .BR mmap (2) call with the .B MAP_SHARED diff --git a/man7/bootparam.7 b/man7/bootparam.7 index 0889a4752..1bbf0ee4c 100644 --- a/man7/bootparam.7 +++ b/man7/bootparam.7 @@ -756,7 +756,7 @@ Syntax: .IP The .I mem_base -value is the value of the memory mapped I/O region that +value is the value of the memory-mapped I/O region that the card uses. This will usually be one of the following values: 0xc8000, 0xca000, 0xcc000, 0xce000, 0xdc000, 0xde000. @@ -860,7 +860,7 @@ you will then have to use a boot argument of the form: .IP The .I mem_base -value is the value of the memory mapped I/O region that +value is the value of the memory-mapped I/O region that the card uses. This will usually be one of the following values: 0xc8000, 0xca000, 0xcc000, 0xce000, 0xdc000, 0xde000. diff --git a/man7/packet.7 b/man7/packet.7 index d62cff2a8..b81612aa6 100644 --- a/man7/packet.7 +++ b/man7/packet.7 @@ -323,7 +323,7 @@ metadata structure and alignment padding. This integer option reserves additional headroom. .TP .BR PACKET_RX_RING -Create a memory mapped ring buffer for asynchronous packet reception. +Create a memory-mapped ring buffer for asynchronous packet reception. The packet socket reserves a contiguous region of application address space, lays it out into an array of packet slots and copies packets (up to @@ -390,7 +390,7 @@ in the Linux kernel source tree. .TP .BR PACKET_TX_RING " (since Linux 2.6.31)" .\" commit 69e3c75f4d541a6eb151b3ef91f34033cb3ad6e1 -Create a memory mapped ring buffer for packet transmission. +Create a memory-mapped ring buffer for packet transmission. This option is similar to .BR PACKET_RX_RING and takes the same arguments.