3 files changed, 21 insertions, 22 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 103c171ce605..75330bd87565 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -117,31 +117,31 @@ config DEBUG_SECTION_MISMATCH
         help
           The section mismatch analysis checks if there are illegal
           references from one section to another section.
-          Linux will during link or during runtime drop some sections
-          and any use of code/data previously in these sections will
+          During linktime or runtime, some sections are dropped;
+          any use of code/data previously in these sections would
           most likely result in an oops.
-          In the code functions and variables are annotated with
-          __init, __devinit etc. (see full list in include/linux/init.h)
+          In the code, functions and variables are annotated with
+          __init, __devinit, etc. (see the full list in include/linux/init.h),
           which results in the code/data being placed in specific sections.
-          The section mismatch analysis is always done after a full
-          kernel build but enabling this option will in addition
-          do the following:
-          - Add the option -fno-inline-functions-called-once to gcc
-            When inlining a function annotated __init in a non-init
-            function we would lose the section information and thus
+          The section mismatch analysis is always performed after a full
+          kernel build, and enabling this option causes the following
+          additional steps to occur:
+          - Add the option -fno-inline-functions-called-once to gcc commands.
+            When inlining a function annotated with __init in a non-init
+            function, we would lose the section information and thus
             the analysis would not catch the illegal reference.
-            This option tells gcc to inline less but will also
-            result in a larger kernel.
-          - Run the section mismatch analysis for each module/built-in.o
-            When we run the section mismatch analysis on vmlinux.o we
+            This option tells gcc to inline less (but it does result in
+            a larger kernel).
+          - Run the section mismatch analysis for each module/built-in.o file.
+            When we run the section mismatch analysis on vmlinux.o, we
             lose valueble information about where the mismatch was
             introduced.
             Running the analysis for each module/built-in.o file
-            will tell where the mismatch happens much closer to the
-            source. The drawback is that we will report the same
-            mismatch at least twice.
-          - Enable verbose reporting from modpost to help solving
-            the section mismatches reported.
+            tells where the mismatch happens much closer to the
+            source. The drawback is that the same mismatch is
+            reported at least twice.
+          - Enable verbose reporting from modpost in order to help resolve
+            the section mismatches that are reported.
 
 config DEBUG_KERNEL
         bool "Kernel debugging"
@@ -835,7 +835,7 @@ config DEBUG_CREDENTIALS
 
 #
 # Select this config option from the architecture Kconfig, if it
-# it is preferred to always offer frame pointers as a config
+# is preferred to always offer frame pointers as a config
 # option on the architecture (regardless of KERNEL_DEBUG):
 #
 config ARCH_WANT_FRAME_POINTERS
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 75ca78f3a8c9..79fc20b65e74 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kallsyms.h>
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
 #include <linux/proc_fs.h>
diff --git a/lib/idr.c b/lib/idr.c
index db040ce3fa73..5acf9bb10968 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -860,7 +860,7 @@ EXPORT_SYMBOL(ida_get_new_above);
  * and go back to the idr_pre_get() call.  If the idr is full, it will
  * return %-ENOSPC.
  *
- * @id returns a value in the range %0 ... %0x7fffffff.
+ * @p_id returns a value in the range %0 ... %0x7fffffff.
  */
 int ida_get_new(struct ida *ida, int *p_id)
 {