1 files changed, 8 insertions, 3 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ebdeb7c4330e..8932c58850be 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -618,6 +618,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
         debug_objects   [KNL] Enable object debugging
 
+        no_debug_objects
+                        [KNL] Disable object debugging
+
         debugpat        [X86] Enable PAT debugging
 
         decnet.addr=    [HW,NET]
@@ -1533,7 +1536,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
         noclflush       [BUGS=X86] Don't use the CLFLUSH instruction
 
-        nohlt           [BUGS=ARM,SH]
+        nohlt           [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
+                        wfi(ARM) instruction doesn't work correctly and not to
+                        use it. This is also useful when using JTAG debugger.
 
         no-hlt          [BUGS=X86-32] Tells the kernel that the hlt
                         instruction doesn't work correctly and not to
@@ -1613,7 +1618,7 @@ and is between 256 and 4096 characters. It is defined in the file
         nosoftlockup    [KNL] Disable the soft-lockup detector.
 
         noswapaccount   [KNL] Disable accounting of swap in memory resource
-                        controller. (See Documentation/controllers/memory.txt)
+                        controller. (See Documentation/cgroups/memory.txt)
 
         nosync          [HW,M68K] Disables sync negotiation for all devices.
 
@@ -1963,7 +1968,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         relax_domain_level=
                         [KNL, SMP] Set scheduler's default relax_domain_level.
-                        See Documentation/cpusets.txt.
+                        See Documentation/cgroups/cpusets.txt.
 
         reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area