---

yaml --- r: 189192 b: refs/heads/master c: 978097c h: refs/heads/master v: v3
git-mirror · Mar 21, 2010 · ca7e4a7 · ca7e4a7
1 parent 0dbb309
commit ca7e4a7
Show file tree

Hide file tree

Showing 318 changed files with 1,773 additions and 2,792 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d54e2c0b0a03b0f05fc4f988323c858ec9d7740
+refs/heads/master: 978097c907b58a2d085bbf7632bee1a5a7e6f6ba
diff --git a/trunk/Documentation/DMA-API-HOWTO.txt → trunk/Documentation/PCI/PCI-DMA-mapping.txt b/trunk/Documentation/DMA-API-HOWTO.txt → trunk/Documentation/PCI/PCI-DMA-mapping.txt
diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt
@@ -340,7 +340,7 @@ Note:
 5.3 swappiness
   Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
 
-  Following cgroups' swappiness can't be changed.
+  Following cgroups' swapiness can't be changed.
   - root cgroup (uses /proc/sys/vm/swappiness).
   - a cgroup which uses hierarchy and it has child cgroup.
   - a cgroup which uses hierarchy and not the root of hierarchy.

diff --git a/trunk/Documentation/circular-buffers.txt b/trunk/Documentation/circular-buffers.txt
diff --git a/trunk/Documentation/filesystems/tmpfs.txt b/trunk/Documentation/filesystems/tmpfs.txt
@@ -82,13 +82,11 @@ tmpfs has a mount option to set the NUMA memory allocation policy for
 all files in that instance (if CONFIG_NUMA is enabled) - which can be
 adjusted on the fly via 'mount -o remount ...'
 
-mpol=default             use the process allocation policy
-                         (see set_mempolicy(2))
+mpol=default             prefers to allocate memory from the local node
 mpol=prefer:Node         prefers to allocate memory from the given Node
 mpol=bind:NodeList       allocates memory only from nodes in NodeList
 mpol=interleave          prefers to allocate from each node in turn
 mpol=interleave:NodeList allocates from each node of NodeList in turn
-mpol=local		 prefers to allocate memory from the local node
 
 NodeList format is a comma-separated list of decimal numbers and ranges,
 a range being two hyphen-separated decimal numbers, the smallest and
@@ -136,5 +134,3 @@ Author:
    Christoph Rohland <cr@sap.com>, 1.12.01
 Updated:
    Hugh Dickins, 4 June 2007
-Updated:
-   KOSAKI Motohiro, 16 Mar 2010
diff --git a/trunk/Documentation/memory-barriers.txt b/trunk/Documentation/memory-barriers.txt
@@ -3,7 +3,6 @@
 			 ============================
 
 By: David Howells <dhowells@redhat.com>
-    Paul E. McKenney <paulmck@linux.vnet.ibm.com>
 
 Contents:
 
@@ -61,10 +60,6 @@ Contents:
 
      - And then there's the Alpha.
 
- (*) Example uses.
-
-     - Circular buffers.
-
  (*) References.
 
 
@@ -2231,21 +2226,6 @@ The Alpha defines the Linux kernel's memory barrier model.
 See the subsection on "Cache Coherency" above.
 
 
-============
-EXAMPLE USES
-============
-
-CIRCULAR BUFFERS
-----------------
-
-Memory barriers can be used to implement circular buffering without the need
-of a lock to serialise the producer with the consumer.  See:
-
-	Documentation/circular-buffers.txt
-
-for details.
-
-
 ==========
 REFERENCES
 ==========

diff --git a/trunk/Documentation/volatile-considered-harmful.txt b/trunk/Documentation/volatile-considered-harmful.txt
@@ -63,9 +63,9 @@ way to perform a busy wait is:
         cpu_relax();
 
 The cpu_relax() call can lower CPU power consumption or yield to a
-hyperthreaded twin processor; it also happens to serve as a compiler
-barrier, so, once again, volatile is unnecessary.  Of course, busy-
-waiting is generally an anti-social act to begin with.
+hyperthreaded twin processor; it also happens to serve as a memory barrier,
+so, once again, volatile is unnecessary.  Of course, busy-waiting is
+generally an anti-social act to begin with.
 
 There are still a few rare situations where volatile makes sense in the
 kernel: