7 files changed, 146 insertions, 54 deletions

diff --git a/Documentation/ABI/testing/procfs-diskstats b/Documentation/ABI/testing/procfs-diskstats
index 99233902e09e..f91a973a37fe 100644
--- a/Documentation/ABI/testing/procfs-diskstats
+++ b/Documentation/ABI/testing/procfs-diskstats
@@ -8,7 +8,7 @@ Description:
                  1 - major number
                  2 - minor mumber
                  3 - device name
-                 4 - reads completed succesfully
+                 4 - reads completed successfully
                  5 - reads merged
                  6 - sectors read
                  7 - time spent reading (ms)
diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block
index 5f3bedaf8e35..d2f90334bb93 100644
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
@@ -4,7 +4,7 @@ Contact:	Jerome Marchand <jmarchan@redhat.com>
 Description:
                 The /sys/block/<disk>/stat files displays the I/O
                 statistics of disk <disk>. They contain 11 fields:
-                 1 - reads completed succesfully
+                 1 - reads completed successfully
                  2 - reads merged
                  3 - sectors read
                  4 - time spent reading (ms)
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 7772928ee48f..deb6b489e4e5 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -144,3 +144,16 @@ Description:
 
                 Write a 1 to force the device to disconnect
                 (equivalent to unplugging a wired USB device).
+
+What:           /sys/bus/usb/drivers/.../remove_id
+Date:           November 2009
+Contact:        CHENG Renquan <rqcheng@smu.edu.sg>
+Description:
+                Writing a device ID to this file will remove an ID
+                that was dynamically added via the new_id sysfs entry.
+                The format for the device ID is:
+                idVendor idProduct.     After successfully
+                removing an ID, the driver will no longer support the
+                device.  This is useful to ensure auto probing won't
+                match the driver to the device.  For example:
+                # echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
diff --git a/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
index 4e8106f7cfd9..25b1e751b777 100644
--- a/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
+++ b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
@@ -23,3 +23,16 @@ Description:
                 Since this relates to security (specifically, the
                 lifetime of PTKs and GTKs) it should not be changed
                 from the default.
+
+What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_phy_rate
+Date:           August 2009
+KernelVersion:  2.6.32
+Contact:        David Vrabel <david.vrabel@csr.com>
+Description:
+                The maximum PHY rate to use for all connected devices.
+                This is only of limited use for testing and
+                development as the hardware's automatic rate
+                adaptation is better then this simple control.
+
+                Refer to [ECMA-368] section 10.3.1.1 for the value to
+                use.
diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory
index 9fe91c02ee40..bf1627b02a03 100644
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
@@ -60,6 +60,19 @@ Description:
 Users:          hotplug memory remove tools
                 https://w3.opensource.ibm.com/projects/powerpc-utils/
 
+
+What:           /sys/devices/system/memoryX/nodeY
+Date:           October 2009
+Contact:        Linux Memory Management list <linux-mm@kvack.org>
+Description:
+                When CONFIG_NUMA is enabled, a symbolic link that
+                points to the corresponding NUMA node directory.
+
+                For example, the following symbolic link is created for
+                memory section 9 on node0:
+                /sys/devices/system/memory/memory9/node0 -> ../../node/node0
+
+
 What:           /sys/devices/system/node/nodeX/memoryY
 Date:           September 2008
 Contact:        Gary Hade <garyhade@us.ibm.com>
@@ -70,4 +83,3 @@ Description:
                 memory section directory.  For example, the following symbolic
                 link is created for memory section 9 on node0.
                 /sys/devices/system/node/node0/memory9 -> ../../memory/memory9
-
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index a703b9e9aeb9..84a710f87c64 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -62,6 +62,35 @@ Description:	CPU topology files that describe kernel limits related to
                 See Documentation/cputopology.txt for more information.
 
 
+What:           /sys/devices/system/cpu/probe
+                /sys/devices/system/cpu/release
+Date:           November 2009
+Contact:        Linux kernel mailing list <linux-kernel@vger.kernel.org>
+Description:    Dynamic addition and removal of CPU's.  This is not hotplug
+                removal, this is meant complete removal/addition of the CPU
+                from the system.
+
+                probe: writes to this file will dynamically add a CPU to the
+                system.  Information written to the file to add CPU's is
+                architecture specific.
+
+                release: writes to this file dynamically remove a CPU from
+                the system.  Information writtento the file to remove CPU's
+                is architecture specific.
+
+What:           /sys/devices/system/cpu/cpu#/node
+Date:           October 2009
+Contact:        Linux memory management mailing list <linux-mm@kvack.org>
+Description:    Discover NUMA node a CPU belongs to
+
+                When CONFIG_NUMA is enabled, a symbolic link that points
+                to the corresponding NUMA node directory.
+
+                For example, the following symlink is created for cpu42
+                in NUMA node 2:
+
+                /sys/devices/system/cpu/cpu42/node2 -> ../../node/node2
+
 
 What:           /sys/devices/system/cpu/cpu#/node
 Date:           October 2009
@@ -136,6 +165,24 @@ Description:	Discover cpuidle policy and mechanism
                 See files in Documentation/cpuidle/ for more information.
 
 
+What:           /sys/devices/system/cpu/cpu#/cpufreq/*
+Date:           pre-git history
+Contact:        cpufreq@vger.kernel.org
+Description:    Discover and change clock speed of CPUs
+
+                Clock scaling allows you to change the clock speed of the
+                CPUs on the fly. This is a nice method to save battery
+                power, because the lower the clock speed, the less power
+                the CPU consumes.
+
+                There are many knobs to tweak in this directory.
+
+                See files in Documentation/cpu-freq/ for more information.
+
+                In particular, read Documentation/cpu-freq/user-guide.txt
+                to learn how to control the knobs.
+
+
 What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
 Date:      August 2008
 KernelVersion:  2.6.27
diff --git a/Documentation/ABI/testing/sysfs-kernel-slab b/Documentation/ABI/testing/sysfs-kernel-slab
index 6dcf75e594fb..8b093f8222d3 100644
--- a/Documentation/ABI/testing/sysfs-kernel-slab
+++ b/Documentation/ABI/testing/sysfs-kernel-slab
@@ -45,8 +45,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The alloc_fastpath file is read-only and specifies how many
-                objects have been allocated using the fast path.
+                The alloc_fastpath file shows how many objects have been
+                allocated using the fast path.  It can be written to clear the
+                current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/alloc_from_partial
@@ -55,9 +56,10 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The alloc_from_partial file is read-only and specifies how
-                many times a cpu slab has been full and it has been refilled
-                by using a slab from the list of partially used slabs.
+                The alloc_from_partial file shows how many times a cpu slab has
+                been full and it has been refilled by using a slab from the list
+                of partially used slabs.  It can be written to clear the current
+                count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/alloc_refill
@@ -66,9 +68,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The alloc_refill file is read-only and specifies how many
-                times the per-cpu freelist was empty but there were objects
-                available as the result of remote cpu frees.
+                The alloc_refill file shows how many times the per-cpu freelist
+                was empty but there were objects available as the result of
+                remote cpu frees.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/alloc_slab
@@ -77,8 +79,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The alloc_slab file is read-only and specifies how many times
-                a new slab had to be allocated from the page allocator.
+                The alloc_slab file is shows how many times a new slab had to
+                be allocated from the page allocator.  It can be written to
+                clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/alloc_slowpath
@@ -87,9 +90,10 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The alloc_slowpath file is read-only and specifies how many
-                objects have been allocated using the slow path because of a
-                refill or allocation from a partial or new slab.
+                The alloc_slowpath file shows how many objects have been
+                allocated using the slow path because of a refill or
+                allocation from a partial or new slab.  It can be written to
+                clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/cache_dma
@@ -117,10 +121,11 @@ KernelVersion:	2.6.31
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file cpuslab_flush is read-only and specifies how many
-                times a cache's cpu slabs have been flushed as the result of
-                destroying or shrinking a cache, a cpu going offline, or as
-                the result of forcing an allocation from a certain node.
+                The file cpuslab_flush shows how many times a cache's cpu slabs
+                have been flushed as the result of destroying or shrinking a
+                cache, a cpu going offline, or as the result of forcing an
+                allocation from a certain node.  It can be written to clear the
+                current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/ctor
@@ -139,8 +144,8 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file deactivate_empty is read-only and specifies how many
-                times an empty cpu slab was deactivated.
+                The deactivate_empty file shows how many times an empty cpu slab
+                was deactivated.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/deactivate_full
@@ -149,8 +154,8 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file deactivate_full is read-only and specifies how many
-                times a full cpu slab was deactivated.
+                The deactivate_full file shows how many times a full cpu slab
+                was deactivated.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/deactivate_remote_frees
@@ -159,9 +164,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file deactivate_remote_frees is read-only and specifies how
-                many times a cpu slab has been deactivated and contained free
-                objects that were freed remotely.
+                The deactivate_remote_frees file shows how many times a cpu slab
+                has been deactivated and contained free objects that were freed
+                remotely.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/deactivate_to_head
@@ -170,9 +175,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file deactivate_to_head is read-only and specifies how
-                many times a partial cpu slab was deactivated and added to the
-                head of its node's partial list.
+                The deactivate_to_head file shows how many times a partial cpu
+                slab was deactivated and added to the head of its node's partial
+                list.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/deactivate_to_tail
@@ -181,9 +186,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file deactivate_to_tail is read-only and specifies how
-                many times a partial cpu slab was deactivated and added to the
-                tail of its node's partial list.
+                The deactivate_to_tail file shows how many times a partial cpu
+                slab was deactivated and added to the tail of its node's partial
+                list.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/destroy_by_rcu
@@ -201,9 +206,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file free_add_partial is read-only and specifies how many
-                times an object has been freed in a full slab so that it had to
-                added to its node's partial list.
+                The free_add_partial file shows how many times an object has
+                been freed in a full slab so that it had to added to its node's
+                partial list.  It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/free_calls
@@ -222,9 +227,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The free_fastpath file is read-only and specifies how many
-                objects have been freed using the fast path because it was an
-                object from the cpu slab.
+                The free_fastpath file shows how many objects have been freed
+                using the fast path because it was an object from the cpu slab.
+                It can be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/free_frozen
@@ -233,9 +238,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The free_frozen file is read-only and specifies how many
-                objects have been freed to a frozen slab (i.e. a remote cpu
-                slab).
+                The free_frozen file shows how many objects have been freed to
+                a frozen slab (i.e. a remote cpu slab).  It can be written to
+                clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/free_remove_partial
@@ -244,9 +249,10 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file free_remove_partial is read-only and specifies how
-                many times an object has been freed to a now-empty slab so
-                that it had to be removed from its node's partial list.
+                The free_remove_partial file shows how many times an object has
+                been freed to a now-empty slab so that it had to be removed from
+                its node's partial list.  It can be written to clear the current
+                count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/free_slab
@@ -255,8 +261,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The free_slab file is read-only and specifies how many times an
-                empty slab has been freed back to the page allocator.
+                The free_slab file shows how many times an empty slab has been
+                freed back to the page allocator.  It can be written to clear
+                the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/free_slowpath
@@ -265,9 +272,9 @@ KernelVersion:	2.6.25
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The free_slowpath file is read-only and specifies how many
-                objects have been freed using the slow path (i.e. to a full or
-                partial slab).
+                The free_slowpath file shows how many objects have been freed
+                using the slow path (i.e. to a full or partial slab).  It can
+                be written to clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/hwcache_align
@@ -346,10 +353,10 @@ KernelVersion:	2.6.26
 Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
                 Christoph Lameter <cl@linux-foundation.org>
 Description:
-                The file order_fallback is read-only and specifies how many
-                times an allocation of a new slab has not been possible at the
-                cache's order and instead fallen back to its minimum possible
-                order.
+                The order_fallback file shows how many times an allocation of a
+                new slab has not been possible at the cache's order and instead
+                fallen back to its minimum possible order.  It can be written to
+                clear the current count.
                 Available when CONFIG_SLUB_STATS is enabled.
 
 What:           /sys/kernel/slab/cache/partial