Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath

[~andy/linux] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fd3ecedc084d7a52dc926a4931f9dd89a55c9ee3..9ca3e74a10e128b4103d00dc8d06c12e6127d4c8 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1070,6 +1070,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                VIA, nVidia)
                        verbose: show contents of HPET registers during setup
 
                                VIA, nVidia)
                        verbose: show contents of HPET registers during setup
 

+       hpet_mmap=      [X86, HPET_MMAP] Allow userspace to mmap HPET
+                       registers.  Default set by CONFIG_HPET_MMAP_DEFAULT.
+

        hugepages=      [HW,X86-32,IA-64] HugeTLB pages to allocate at boot.
        hugepagesz=     [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages.
                        On x86-64 and powerpc, this option can be specified
        hugepages=      [HW,X86-32,IA-64] HugeTLB pages to allocate at boot.
        hugepagesz=     [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages.
                        On x86-64 and powerpc, this option can be specified


@@ -1775,6 +1778,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        that the amount of memory usable for all allocations
                        is not too small.
 
                        that the amount of memory usable for all allocations
                        is not too small.
 

+       movable_node    [KNL,X86] Boot-time switch to enable the effects
+                       of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.
+

        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>
 
        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>