Merge branch 'x86/cpu' into x86/x2apic

4 files changed, 23 insertions, 1 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index e1d4764435ed..800ac8485544 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -735,6 +735,15 @@ config FIREWIRE_OHCI_REMOTE_DMA
 
           If unsure, say N.
 
+menuconfig BUILD_DOCSRC
+        bool "Build targets in Documentation/ tree"
+        depends on HEADERS_CHECK
+        help
+          This option attempts to build objects from the source files in the
+          kernel Documentation/ tree.
+
+          Say N if you are unsure.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 482df94ea21e..06fb57c86de0 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -316,6 +316,17 @@ int bitmap_scnprintf(char *buf, unsigned int buflen,
 EXPORT_SYMBOL(bitmap_scnprintf);
 
 /**
+ * bitmap_scnprintf_len - return buffer length needed to convert
+ * bitmap to an ASCII hex string
+ * @nr_bits: number of bits to be converted
+ */
+int bitmap_scnprintf_len(unsigned int nr_bits)
+{
+        unsigned int nr_nibbles = ALIGN(nr_bits, 4) / 4;
+        return nr_nibbles + ALIGN(nr_nibbles, CHUNKSZ / 4) / (CHUNKSZ / 4) - 1;
+}
+
+/**
  * __bitmap_parse - convert an ASCII hex string into a bitmap.
  * @buf: pointer to buffer containing string.
  * @buflen: buffer size in bytes.  If string is smaller than this
diff --git a/lib/debug_locks.c b/lib/debug_locks.c
index 0ef01d14727c..0218b4693dd8 100644
--- a/lib/debug_locks.c
+++ b/lib/debug_locks.c
@@ -8,6 +8,7 @@
  *
  *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
  */
+#include <linux/kernel.h>
 #include <linux/rwsem.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
@@ -37,6 +38,7 @@ int debug_locks_off(void)
 {
         if (xchg(&debug_locks, 0)) {
                 if (!debug_locks_silent) {
+                        oops_in_progress = 1;
                         console_verbose();
                         return 1;
                 }
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 1dc2d1d18fa8..d8d1d1142248 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -220,7 +220,7 @@ int strict_strtou##type(const char *cp, unsigned int base, valtype *res)\
         if (len == 0)                                                   \
                 return -EINVAL;                                         \
                                                                         \
-        val = simple_strtoul(cp, &tail, base);                          \
+        val = simple_strtou##type(cp, &tail, base);                     \
         if ((*tail == '\0') ||                                          \
                 ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {\
                 *res = val;                                             \