8 files changed, 27 insertions, 32 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index df9234c5f9d1..c768bcdda1b7 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -434,11 +434,9 @@ config DEBUG_KMEMLEAK_EARLY_LOG_SIZE
 
 config DEBUG_KMEMLEAK_TEST
         tristate "Simple test for the kernel memory leak detector"
-        depends on DEBUG_KMEMLEAK
+        depends on DEBUG_KMEMLEAK && m
         help
-          Say Y or M here to build a test for the kernel memory leak
-          detector. This option enables a module that explicitly leaks
-          memory.
+          This option enables a module that explicitly leaks memory.
 
           If unsure, say N.
 
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 741fae905ae3..91e0ccfdb424 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -830,7 +830,7 @@ EXPORT_SYMBOL(bitmap_bitremap);
  *  @orig (i.e. bits 3, 5, 7 and 9) were also set.
  *
  *  When bit 11 is set in @orig, it means turn on the bit in
- *  @dst corresponding to whatever is the twelth bit that is
+ *  @dst corresponding to whatever is the twelfth bit that is
  *  turned on in @relmap.  In the above example, there were
  *  only ten bits turned on in @relmap (30..39), so that bit
  *  11 was set in @orig had no affect on @dst.
diff --git a/lib/btree.c b/lib/btree.c
index c9c6f0351526..2a34392bcecc 100644
--- a/lib/btree.c
+++ b/lib/btree.c
@@ -11,7 +11,7 @@
  * see http://programming.kicks-ass.net/kernel-patches/vma_lookup/btree.patch
  *
  * A relatively simple B+Tree implementation.  I have written it as a learning
- * excercise to understand how B+Trees work.  Turned out to be useful as well.
+ * exercise to understand how B+Trees work.  Turned out to be useful as well.
  *
  * B+Trees can be used similar to Linux radix trees (which don't have anything
  * in common with textbook radix trees, beware).  Prerequisite for them working
@@ -541,7 +541,7 @@ static void rebalance(struct btree_head *head, struct btree_geo *geo,
         int i, no_left, no_right;
 
         if (fill == 0) {
-                /* Because we don't steal entries from a neigbour, this case
+                /* Because we don't steal entries from a neighbour, this case
                  * can happen.  Parent node contains a single child, this
                  * node, so merging with a sibling never happens.
                  */
diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c
index cecd23df2b9a..9f34eb56854d 100644
--- a/lib/decompress_unxz.c
+++ b/lib/decompress_unxz.c
@@ -83,7 +83,7 @@
  *    safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536
  *                  = 128 + (uncompressed_size >> 12) + 65536
  *
- * For comparision, according to arch/x86/boot/compressed/misc.c, the
+ * For comparison, according to arch/x86/boot/compressed/misc.c, the
  * equivalent formula for Deflate is this:
  *
  *    safety_margin = 18 + (uncompressed_size >> 12) + 32768
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index 05672e819f8c..a235f3cc471c 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -49,12 +49,9 @@ static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res)
                         val = *s - '0';
                 else if ('a' <= _tolower(*s) && _tolower(*s) <= 'f')
                         val = _tolower(*s) - 'a' + 10;
-                else if (*s == '\n') {
-                        if (*(s + 1) == '\0')
-                                break;
-                        else
-                                return -EINVAL;
-                } else
+                else if (*s == '\n' && *(s + 1) == '\0')
+                        break;
+                else
                         return -EINVAL;
 
                 if (val >= base)
diff --git a/lib/parser.c b/lib/parser.c
index 6e89eca5cca0..dcbaaef6cf11 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -13,7 +13,7 @@
 
 /**
  * match_one: - Determines if a string matches a simple pattern
- * @s: the string to examine for presense of the pattern
+ * @s: the string to examine for presence of the pattern
  * @p: the string containing the pattern
  * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match
  * locations.
diff --git a/lib/test-kstrtox.c b/lib/test-kstrtox.c
index 325c2f9ecebd..d55769d63cb8 100644
--- a/lib/test-kstrtox.c
+++ b/lib/test-kstrtox.c
@@ -315,12 +315,12 @@ static void __init test_kstrtou64_ok(void)
                 {"65537",       10,     65537},
                 {"2147483646",  10,     2147483646},
                 {"2147483647",  10,     2147483647},
-                {"2147483648",  10,     2147483648},
-                {"2147483649",  10,     2147483649},
-                {"4294967294",  10,     4294967294},
-                {"4294967295",  10,     4294967295},
-                {"4294967296",  10,     4294967296},
-                {"4294967297",  10,     4294967297},
+                {"2147483648",  10,     2147483648ULL},
+                {"2147483649",  10,     2147483649ULL},
+                {"4294967294",  10,     4294967294ULL},
+                {"4294967295",  10,     4294967295ULL},
+                {"4294967296",  10,     4294967296ULL},
+                {"4294967297",  10,     4294967297ULL},
                 {"9223372036854775806", 10,     9223372036854775806ULL},
                 {"9223372036854775807", 10,     9223372036854775807ULL},
                 {"9223372036854775808", 10,     9223372036854775808ULL},
@@ -369,12 +369,12 @@ static void __init test_kstrtos64_ok(void)
                 {"65537",       10,     65537},
                 {"2147483646",  10,     2147483646},
                 {"2147483647",  10,     2147483647},
-                {"2147483648",  10,     2147483648},
-                {"2147483649",  10,     2147483649},
-                {"4294967294",  10,     4294967294},
-                {"4294967295",  10,     4294967295},
-                {"4294967296",  10,     4294967296},
-                {"4294967297",  10,     4294967297},
+                {"2147483648",  10,     2147483648LL},
+                {"2147483649",  10,     2147483649LL},
+                {"4294967294",  10,     4294967294LL},
+                {"4294967295",  10,     4294967295LL},
+                {"4294967296",  10,     4294967296LL},
+                {"4294967297",  10,     4294967297LL},
                 {"9223372036854775806", 10,     9223372036854775806LL},
                 {"9223372036854775807", 10,     9223372036854775807LL},
         };
@@ -418,10 +418,10 @@ static void __init test_kstrtou32_ok(void)
                 {"65537",       10,     65537},
                 {"2147483646",  10,     2147483646},
                 {"2147483647",  10,     2147483647},
-                {"2147483648",  10,     2147483648},
-                {"2147483649",  10,     2147483649},
-                {"4294967294",  10,     4294967294},
-                {"4294967295",  10,     4294967295},
+                {"2147483648",  10,     2147483648U},
+                {"2147483649",  10,     2147483649U},
+                {"4294967294",  10,     4294967294U},
+                {"4294967295",  10,     4294967295U},
         };
         TEST_OK(kstrtou32, u32, "%u", test_u32_ok);
 }
diff --git a/lib/timerqueue.c b/lib/timerqueue.c
index e3a1050e6820..191176a43e9a 100644
--- a/lib/timerqueue.c
+++ b/lib/timerqueue.c
@@ -5,7 +5,7 @@
  *  Uses rbtrees for quick list adds and expiration.
  *
  *  NOTE: All of the following functions need to be serialized
- *  to avoid races. No locking is done by this libary code.
+ *  to avoid races. No locking is done by this library code.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by