6 files changed, 46 insertions, 10 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a48abeac753f..dd7f8858188a 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -980,6 +980,21 @@ config DEBUG_LOCKING_API_SELFTESTS
           The following locking APIs are covered: spinlocks, rwlocks,
           mutexes and rwsems.
 
+config LOCK_TORTURE_TEST
+        tristate "torture tests for locking"
+        depends on DEBUG_KERNEL
+        select TORTURE_TEST
+        default n
+        help
+          This option provides a kernel module that runs torture tests
+          on kernel locking primitives.  The kernel module may be built
+          after the fact on the running kernel to be tested, if desired.
+
+          Say Y here if you want kernel locking-primitive torture tests
+          to be built into the kernel.
+          Say M if you want these torture tests to build as a module.
+          Say N if you are unsure.
+
 endmenu # lock debugging
 
 config TRACE_IRQFLAGS
@@ -1141,9 +1156,14 @@ config SPARSE_RCU_POINTER
 
          Say N if you are unsure.
 
+config TORTURE_TEST
+        tristate
+        default n
+
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
+        select TORTURE_TEST
         default n
         help
           This option provides a kernel module that runs torture tests
diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index 4dc1b990aa23..34fd931b54b5 100644
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -9,7 +9,7 @@ if FONT_SUPPORT
 
 config FONTS
         bool "Select compiled-in fonts"
-        depends on FRAMEBUFFER_CONSOLE
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
         help
           Say Y here if you would like to use fonts other than the default
           your frame buffer console usually use.
@@ -22,7 +22,7 @@ config FONTS
 
 config FONT_8x8
         bool "VGA 8x8 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
         default y if !SPARC && !FONTS
         help
           This is the "high resolution" font for the VGA frame buffer (the one
@@ -45,7 +45,7 @@ config FONT_8x16
 
 config FONT_6x11
         bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
         default y if !SPARC && !FONTS && MAC
         help
           Small console font with Macintosh-style high-half glyphs.  Some Mac
diff --git a/lib/kobject.c b/lib/kobject.c
index cb14aeac4cca..58751bb80a7c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -94,7 +94,7 @@ static int create_dir(struct kobject *kobj)
                 BUG_ON(ops->type >= KOBJ_NS_TYPES);
                 BUG_ON(!kobj_ns_type_registered(ops->type));
 
-                kernfs_enable_ns(kobj->sd);
+                sysfs_enable_ns(kobj->sd);
         }
 
         return 0;
diff --git a/lib/random32.c b/lib/random32.c
index 1e5b2df44291..614896778700 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -244,8 +244,19 @@ static void __prandom_reseed(bool late)
         static bool latch = false;
         static DEFINE_SPINLOCK(lock);
 
+        /* Asking for random bytes might result in bytes getting
+         * moved into the nonblocking pool and thus marking it
+         * as initialized. In this case we would double back into
+         * this function and attempt to do a late reseed.
+         * Ignore the pointless attempt to reseed again if we're
+         * already waiting for bytes when the nonblocking pool
+         * got initialized.
+         */
+
         /* only allow initial seeding (late == false) once */
-        spin_lock_irqsave(&lock, flags);
+        if (!spin_trylock_irqsave(&lock, flags))
+                return;
+
         if (latch && !late)
                 goto out;
         latch = true;
diff --git a/lib/string.c b/lib/string.c
index e5878de4f101..9b1f9062a202 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -648,7 +648,7 @@ EXPORT_SYMBOL(memmove);
  * @count: The size of the area.
  */
 #undef memcmp
-int memcmp(const void *cs, const void *ct, size_t count)
+__visible int memcmp(const void *cs, const void *ct, size_t count)
 {
         const unsigned char *su1, *su2;
         int res = 0;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 185b6d300ebc..5e2cf6f342f8 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -719,10 +719,15 @@ char *resource_string(char *buf, char *end, struct resource *res,
                 specp = &mem_spec;
                 decode = 0;
         }
-        p = number(p, pend, res->start, *specp);
-        if (res->start != res->end) {
-                *p++ = '-';
-                p = number(p, pend, res->end, *specp);
+        if (decode && res->flags & IORESOURCE_UNSET) {
+                p = string(p, pend, "size ", str_spec);
+                p = number(p, pend, resource_size(res), *specp);
+        } else {
+                p = number(p, pend, res->start, *specp);
+                if (res->start != res->end) {
+                        *p++ = '-';
+                        p = number(p, pend, res->end, *specp);
+                }
         }
         if (decode) {
                 if (res->flags & IORESOURCE_MEM_64)