23 files changed, 204 insertions, 111 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 819ac51202c0..ccca32264748 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -501,6 +501,16 @@ config DEBUG_VM
 
           If unsure, say N.
 
+config DEBUG_VM_VMACACHE
+        bool "Debug VMA caching"
+        depends on DEBUG_VM
+        help
+          Enable this to turn on VMA caching debug information. Doing so
+          can cause significant overhead, so only enable it in non-production
+          environments.
+
+          If unsure, say N.
+
 config DEBUG_VM_RB
         bool "Debug VM red-black trees"
         depends on DEBUG_VM
@@ -575,8 +585,8 @@ config DEBUG_HIGHMEM
         bool "Highmem debugging"
         depends on DEBUG_KERNEL && HIGHMEM
         help
-          This options enables addition error checking for high memory systems.
-          Disable for production systems.
+          This option enables additional error checking for high memory
+          systems.  Disable for production systems.
 
 config HAVE_DEBUG_STACKOVERFLOW
         bool
@@ -823,11 +833,6 @@ config DEBUG_RT_MUTEXES
          This allows rt mutex semantics violations and rt mutex related
          deadlocks (lockups) to be detected and reported automatically.
 
-config DEBUG_PI_LIST
-        bool
-        default y
-        depends on DEBUG_RT_MUTEXES
-
 config RT_MUTEX_TESTER
         bool "Built-in scriptable tester for rt-mutexes"
         depends on DEBUG_KERNEL && RT_MUTEXES
@@ -1053,6 +1058,16 @@ config DEBUG_LIST
 
           If unsure, say N.
 
+config DEBUG_PI_LIST
+        bool "Debug priority linked list manipulation"
+        depends on DEBUG_KERNEL
+        help
+          Enable this to turn on extended checks in the priority-ordered
+          linked-list (plist) walking routines.  This checks the entire
+          list multiple times during each manipulation.
+
+          If unsure, say N.
+
 config DEBUG_SG
         bool "Debug SG table operations"
         depends on DEBUG_KERNEL
diff --git a/lib/Makefile b/lib/Makefile
index 0cd7b68e1382..74a32dc49a93 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -148,7 +148,8 @@ obj-$(CONFIG_GENERIC_NET_UTILS) += net_utils.o
 
 obj-$(CONFIG_STMP_DEVICE) += stmp_device.o
 
-libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o
+libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
+               fdt_empty_tree.o
 $(foreach file, $(libfdt_files), \
         $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
 lib-$(CONFIG_LIBFDT) += $(libfdt_files)
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index 11b9b01fda6b..1a000bb050f9 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -140,7 +140,7 @@ error:
  * @decoder: The decoder definition (produced by asn1_compiler)
  * @context: The caller's context (to be passed to the action functions)
  * @data: The encoded data
- * @datasize: The size of the encoded data
+ * @datalen: The size of the encoded data
  *
  * Decode BER/DER/CER encoded ASN.1 data according to a bytecode pattern
  * produced by asn1_compiler.  Action functions are called on marked tags to
diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c
index 00bca223d1e1..0211d30d8c39 100644
--- a/lib/atomic64_test.c
+++ b/lib/atomic64_test.c
@@ -8,6 +8,9 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
@@ -146,18 +149,18 @@ static __init int test_atomic64(void)
         BUG_ON(v.counter != r);
 
 #ifdef CONFIG_X86
-        printk(KERN_INFO "atomic64 test passed for %s platform %s CX8 and %s SSE\n",
+        pr_info("passed for %s platform %s CX8 and %s SSE\n",
 #ifdef CONFIG_X86_64
-               "x86-64",
+                "x86-64",
 #elif defined(CONFIG_X86_CMPXCHG64)
-               "i586+",
+                "i586+",
 #else
-               "i386+",
+                "i386+",
 #endif
                boot_cpu_has(X86_FEATURE_CX8) ? "with" : "without",
                boot_cpu_has(X86_FEATURE_XMM) ? "with" : "without");
 #else
-        printk(KERN_INFO "atomic64 test passed\n");
+        pr_info("passed\n");
 #endif
 
         return 0;
diff --git a/lib/btree.c b/lib/btree.c
index f9a484676cb6..4264871ea1a0 100644
--- a/lib/btree.c
+++ b/lib/btree.c
@@ -198,6 +198,7 @@ EXPORT_SYMBOL_GPL(btree_init);
 
 void btree_destroy(struct btree_head *head)
 {
+        mempool_free(head->node, head->mempool);
         mempool_destroy(head->mempool);
         head->mempool = NULL;
 }
diff --git a/lib/bug.c b/lib/bug.c
index 168603477f02..d1d7c7878900 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -37,6 +37,9 @@
 
     Jeremy Fitzhardinge <jeremy@goop.org> 2006
  */
+
+#define pr_fmt(fmt) fmt
+
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -153,15 +156,13 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
         if (warning) {
                 /* this is a WARN_ON rather than BUG/BUG_ON */
-                printk(KERN_WARNING "------------[ cut here ]------------\n");
+                pr_warn("------------[ cut here ]------------\n");
 
                 if (file)
-                        printk(KERN_WARNING "WARNING: at %s:%u\n",
-                               file, line);
+                        pr_warn("WARNING: at %s:%u\n", file, line);
                 else
-                        printk(KERN_WARNING "WARNING: at %p "
-                               "[verbose debug info unavailable]\n",
-                               (void *)bugaddr);
+                        pr_warn("WARNING: at %p [verbose debug info unavailable]\n",
+                                (void *)bugaddr);
 
                 print_modules();
                 show_regs(regs);
@@ -174,12 +175,10 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
         printk(KERN_DEFAULT "------------[ cut here ]------------\n");
 
         if (file)
-                printk(KERN_CRIT "kernel BUG at %s:%u!\n",
-                       file, line);
+                pr_crit("kernel BUG at %s:%u!\n", file, line);
         else
-                printk(KERN_CRIT "Kernel BUG at %p "
-                       "[verbose debug info unavailable]\n",
-                       (void *)bugaddr);
+                pr_crit("Kernel BUG at %p [verbose debug info unavailable]\n",
+                        (void *)bugaddr);
 
         return BUG_TRAP_TYPE_BUG;
 }
diff --git a/lib/crc32.c b/lib/crc32.c
index 70f00ca5ef1e..21a7b2135af6 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -33,13 +33,13 @@
 #include "crc32defs.h"
 
 #if CRC_LE_BITS > 8
-# define tole(x) ((__force u32) __constant_cpu_to_le32(x))
+# define tole(x) ((__force u32) cpu_to_le32(x))
 #else
 # define tole(x) (x)
 #endif
 
 #if CRC_BE_BITS > 8
-# define tobe(x) ((__force u32) __constant_cpu_to_be32(x))
+# define tobe(x) ((__force u32) cpu_to_be32(x))
 #else
 # define tobe(x) (x)
 #endif
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index e0731c3db706..547f7f923dbc 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -7,6 +7,9 @@
  *
  * For licencing details see kernel-base/COPYING
  */
+
+#define pr_fmt(fmt) "ODEBUG: " fmt
+
 #include <linux/debugobjects.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -218,7 +221,7 @@ static void debug_objects_oom(void)
         unsigned long flags;
         int i;
 
-        printk(KERN_WARNING "ODEBUG: Out of memory. ODEBUG disabled\n");
+        pr_warn("Out of memory. ODEBUG disabled\n");
 
         for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) {
                 raw_spin_lock_irqsave(&db->lock, flags);
@@ -292,11 +295,9 @@ static void debug_object_is_on_stack(void *addr, int onstack)
 
         limit++;
         if (is_on_stack)
-                printk(KERN_WARNING
-                       "ODEBUG: object is on stack, but not annotated\n");
+                pr_warn("object is on stack, but not annotated\n");
         else
-                printk(KERN_WARNING
-                       "ODEBUG: object is not on stack, but annotated\n");
+                pr_warn("object is not on stack, but annotated\n");
         WARN_ON(1);
 }
 
@@ -985,7 +986,7 @@ static void __init debug_objects_selftest(void)
         if (check_results(&obj, ODEBUG_STATE_NONE, ++fixups, ++warnings))
                 goto out;
 #endif
-        printk(KERN_INFO "ODEBUG: selftest passed\n");
+        pr_info("selftest passed\n");
 
 out:
         debug_objects_fixups = oldfixups;
@@ -1060,8 +1061,8 @@ static int __init debug_objects_replace_static_objects(void)
         }
         local_irq_enable();
 
-        printk(KERN_DEBUG "ODEBUG: %d of %d active objects replaced\n", cnt,
-               obj_pool_used);
+        pr_debug("%d of %d active objects replaced\n",
+                 cnt, obj_pool_used);
         return 0;
 free:
         hlist_for_each_entry_safe(obj, tmp, &objects, node) {
@@ -1090,7 +1091,7 @@ void __init debug_objects_mem_init(void)
                 debug_objects_enabled = 0;
                 if (obj_cache)
                         kmem_cache_destroy(obj_cache);
-                printk(KERN_WARNING "ODEBUG: out of memory.\n");
+                pr_warn("out of memory.\n");
         } else
                 debug_objects_selftest();
 }
diff --git a/lib/devres.c b/lib/devres.c
index 2f16c133fd36..f562bf6ff71d 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -157,12 +157,12 @@ EXPORT_SYMBOL(devm_ioremap_resource);
  *      if (!base)
  *              return -EADDRNOTAVAIL;
  */
-void __iomem *devm_request_and_ioremap(struct device *device,
+void __iomem *devm_request_and_ioremap(struct device *dev,
                                        struct resource *res)
 {
         void __iomem *dest_ptr;
 
-        dest_ptr = devm_ioremap_resource(device, res);
+        dest_ptr = devm_ioremap_resource(dev, res);
         if (IS_ERR(dest_ptr))
                 return NULL;
 
@@ -194,7 +194,7 @@ static int devm_ioport_map_match(struct device *dev, void *res,
  * Managed ioport_map().  Map is automatically unmapped on driver
  * detach.
  */
-void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
+void __iomem *devm_ioport_map(struct device *dev, unsigned long port,
                                unsigned int nr)
 {
         void __iomem **ptr, *addr;
@@ -265,7 +265,7 @@ static void pcim_iomap_release(struct device *gendev, void *res)
  * be safely called without context and guaranteed to succed once
  * allocated.
  */
-void __iomem * const * pcim_iomap_table(struct pci_dev *pdev)
+void __iomem * const *pcim_iomap_table(struct pci_dev *pdev)
 {
         struct pcim_iomap_devres *dr, *new_dr;
 
@@ -290,7 +290,7 @@ EXPORT_SYMBOL(pcim_iomap_table);
  * Managed pci_iomap().  Map is automatically unmapped on driver
  * detach.
  */
-void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen)
+void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen)
 {
         void __iomem **tbl;
 
diff --git a/lib/digsig.c b/lib/digsig.c
index 8793aeda30ca..ae05ea393fc8 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -175,10 +175,11 @@ err1:
  * digsig_verify() - digital signature verification with public key
  * @keyring:    keyring to search key in
  * @sig:        digital signature
- * @sigen:      length of the signature
+ * @siglen:     length of the signature
  * @data:       data
  * @datalen:    length of the data
- * @return:     0 on success, -EINVAL otherwise
+ *
+ * Returns 0 on success, -EINVAL otherwise
  *
  * Verifies data integrity against digital signature.
  * Currently only RSA is supported.
diff --git a/lib/fdt_empty_tree.c b/lib/fdt_empty_tree.c
new file mode 100644
index 000000000000..5d30c58150ad
--- /dev/null
+++ b/lib/fdt_empty_tree.c
@@ -0,0 +1,2 @@
+#include <linux/libfdt_env.h>
+#include "../scripts/dtc/libfdt/fdt_empty_tree.c"
diff --git a/lib/idr.c b/lib/idr.c
index 2642fa8e424d..39158abebad1 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -18,12 +18,6 @@
  * pointer or what ever, we treat it as a (void *).  You can pass this
  * id to a user for him to pass back at a later time.  You then pass
  * that id to this code and it returns your pointer.
-
- * You can release ids at any time. When all ids are released, most of
- * the memory is returned (we keep MAX_IDR_FREE) in a local pool so we
- * don't need to go to the memory "store" during an id allocate, just
- * so you don't need to be too concerned about locking and conflicts
- * with the slab allocator.
  */
 
 #ifndef TEST                        // to test in user space...
@@ -151,7 +145,7 @@ static void idr_layer_rcu_free(struct rcu_head *head)
 
 static inline void free_layer(struct idr *idr, struct idr_layer *p)
 {
-        if (idr->hint && idr->hint == p)
+        if (idr->hint == p)
                 RCU_INIT_POINTER(idr->hint, NULL);
         call_rcu(&p->rcu_head, idr_layer_rcu_free);
 }
@@ -249,7 +243,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa,
                         id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
 
                         /* if already at the top layer, we need to grow */
-                        if (id >= 1 << (idp->layers * IDR_BITS)) {
+                        if (id > idr_max(idp->layers)) {
                                 *starting_id = id;
                                 return -EAGAIN;
                         }
@@ -562,6 +556,11 @@ void idr_remove(struct idr *idp, int id)
         if (id < 0)
                 return;
 
+        if (id > idr_max(idp->layers)) {
+                idr_remove_warning(id);
+                return;
+        }
+
         sub_remove(idp, (idp->layers - 1) * IDR_BITS, id);
         if (idp->top && idp->top->count == 1 && (idp->layers > 1) &&
             idp->top->ary[0]) {
@@ -579,16 +578,6 @@ void idr_remove(struct idr *idp, int id)
                 bitmap_clear(to_free->bitmap, 0, IDR_SIZE);
                 free_layer(idp, to_free);
         }
-        while (idp->id_free_cnt >= MAX_IDR_FREE) {
-                p = get_from_free_list(idp);
-                /*
-                 * Note: we don't call the rcu callback here, since the only
-                 * layers that fall into the freelist are those that have been
-                 * preallocated.
-                 */
-                kmem_cache_free(idr_layer_cache, p);
-        }
-        return;
 }
 EXPORT_SYMBOL(idr_remove);
 
@@ -809,14 +798,12 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 
         p = idp->top;
         if (!p)
-                return ERR_PTR(-EINVAL);
-
-        n = (p->layer+1) * IDR_BITS;
+                return ERR_PTR(-ENOENT);
 
-        if (id >= (1 << n))
-                return ERR_PTR(-EINVAL);
+        if (id > idr_max(p->layer + 1))
+                return ERR_PTR(-ENOENT);
 
-        n -= IDR_BITS;
+        n = p->layer * IDR_BITS;
         while ((n > 0) && p) {
                 p = p->ary[(id >> n) & IDR_MASK];
                 n -= IDR_BITS;
@@ -1027,6 +1014,9 @@ void ida_remove(struct ida *ida, int id)
         int n;
         struct ida_bitmap *bitmap;
 
+        if (idr_id > idr_max(ida->idr.layers))
+                goto err;
+
         /* clear full bits while looking up the leaf idr_layer */
         while ((shift > 0) && p) {
                 n = (idr_id >> shift) & IDR_MASK;
@@ -1042,7 +1032,7 @@ void ida_remove(struct ida *ida, int id)
         __clear_bit(n, p->bitmap);
 
         bitmap = (void *)p->ary[n];
-        if (!test_bit(offset, bitmap->bitmap))
+        if (!bitmap || !test_bit(offset, bitmap->bitmap))
                 goto err;
 
         /* update bitmap and remove it if empty */
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 4e3bd71bd949..9ebf9e20de53 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -29,7 +29,9 @@
 
 
 u64 uevent_seqnum;
+#ifdef CONFIG_UEVENT_HELPER
 char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
+#endif
 #ifdef CONFIG_NET
 struct uevent_sock {
         struct list_head list;
@@ -109,6 +111,7 @@ static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
 }
 #endif
 
+#ifdef CONFIG_UEVENT_HELPER
 static int kobj_usermode_filter(struct kobject *kobj)
 {
         const struct kobj_ns_type_operations *ops;
@@ -147,6 +150,7 @@ static void cleanup_uevent_env(struct subprocess_info *info)
 {
         kfree(info->data);
 }
+#endif
 
 /**
  * kobject_uevent_env - send an uevent with environmental data
@@ -323,6 +327,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 #endif
         mutex_unlock(&uevent_sock_mutex);
 
+#ifdef CONFIG_UEVENT_HELPER
         /* call uevent_helper, usually only enabled during early boot */
         if (uevent_helper[0] && !kobj_usermode_filter(kobj)) {
                 struct subprocess_info *info;
@@ -347,6 +352,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                         env = NULL;     /* freed by cleanup_uevent_env */
                 }
         }
+#endif
 
 exit:
         kfree(devpath);
diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c
index 244f5480c898..b3131f5cf8a2 100644
--- a/lib/libcrc32c.c
+++ b/lib/libcrc32c.c
@@ -62,10 +62,7 @@ EXPORT_SYMBOL(crc32c);
 static int __init libcrc32c_mod_init(void)
 {
         tfm = crypto_alloc_shash("crc32c", 0, 0);
-        if (IS_ERR(tfm))
-                return PTR_ERR(tfm);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(tfm);
 }
 
 static void __exit libcrc32c_mod_fini(void)
diff --git a/lib/nlattr.c b/lib/nlattr.c
index 10ad042d01be..9c3e85ff0a6c 100644
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -136,6 +136,7 @@ int nla_validate(const struct nlattr *head, int len, int maxtype,
 errout:
         return err;
 }
+EXPORT_SYMBOL(nla_validate);
 
 /**
  * nla_policy_len - Determin the max. length of a policy
@@ -162,6 +163,7 @@ nla_policy_len(const struct nla_policy *p, int n)
 
         return len;
 }
+EXPORT_SYMBOL(nla_policy_len);
 
 /**
  * nla_parse - Parse a stream of attributes into a tb buffer
@@ -208,6 +210,7 @@ int nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head,
 errout:
         return err;
 }
+EXPORT_SYMBOL(nla_parse);
 
 /**
  * nla_find - Find a specific attribute in a stream of attributes
@@ -228,6 +231,7 @@ struct nlattr *nla_find(const struct nlattr *head, int len, int attrtype)
 
         return NULL;
 }
+EXPORT_SYMBOL(nla_find);
 
 /**
  * nla_strlcpy - Copy string attribute payload into a sized buffer
@@ -258,6 +262,7 @@ size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)
 
         return srclen;
 }
+EXPORT_SYMBOL(nla_strlcpy);
 
 /**
  * nla_memcpy - Copy a netlink attribute into another memory area
@@ -278,6 +283,7 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
 
         return minlen;
 }
+EXPORT_SYMBOL(nla_memcpy);
 
 /**
  * nla_memcmp - Compare an attribute with sized memory area
@@ -295,6 +301,7 @@ int nla_memcmp(const struct nlattr *nla, const void *data,
 
         return d;
 }
+EXPORT_SYMBOL(nla_memcmp);
 
 /**
  * nla_strcmp - Compare a string attribute against a string
@@ -317,6 +324,7 @@ int nla_strcmp(const struct nlattr *nla, const char *str)
 
         return d;
 }
+EXPORT_SYMBOL(nla_strcmp);
 
 #ifdef CONFIG_NET
 /**
@@ -502,12 +510,3 @@ int nla_append(struct sk_buff *skb, int attrlen, const void *data)
 }
 EXPORT_SYMBOL(nla_append);
 #endif
-
-EXPORT_SYMBOL(nla_validate);
-EXPORT_SYMBOL(nla_policy_len);
-EXPORT_SYMBOL(nla_parse);
-EXPORT_SYMBOL(nla_find);
-EXPORT_SYMBOL(nla_strlcpy);
-EXPORT_SYMBOL(nla_memcpy);
-EXPORT_SYMBOL(nla_memcmp);
-EXPORT_SYMBOL(nla_strcmp);
diff --git a/lib/plist.c b/lib/plist.c
index 1ebc95f7a46f..d408e774b746 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -134,6 +134,46 @@ void plist_del(struct plist_node *node, struct plist_head *head)
         plist_check_head(head);
 }
 
+/**
+ * plist_requeue - Requeue @node at end of same-prio entries.
+ *
+ * This is essentially an optimized plist_del() followed by
+ * plist_add().  It moves an entry already in the plist to
+ * after any other same-priority entries.
+ *
+ * @node:       &struct plist_node pointer - entry to be moved
+ * @head:       &struct plist_head pointer - list head
+ */
+void plist_requeue(struct plist_node *node, struct plist_head *head)
+{
+        struct plist_node *iter;
+        struct list_head *node_next = &head->node_list;
+
+        plist_check_head(head);
+        BUG_ON(plist_head_empty(head));
+        BUG_ON(plist_node_empty(node));
+
+        if (node == plist_last(head))
+                return;
+
+        iter = plist_next(node);
+
+        if (node->prio != iter->prio)
+                return;
+
+        plist_del(node, head);
+
+        plist_for_each_continue(iter, head) {
+                if (node->prio != iter->prio) {
+                        node_next = &iter->node_list;
+                        break;
+                }
+        }
+        list_add_tail(&node->node_list, node_next);
+
+        plist_check_head(head);
+}
+
 #ifdef CONFIG_DEBUG_PI_LIST
 #include <linux/sched.h>
 #include <linux/module.h>
@@ -170,12 +210,20 @@ static void __init plist_test_check(int nr_expect)
         BUG_ON(prio_pos->prio_list.next != &first->prio_list);
 }
 
+static void __init plist_test_requeue(struct plist_node *node)
+{
+        plist_requeue(node, &test_head);
+
+        if (node != plist_last(&test_head))
+                BUG_ON(node->prio == plist_next(node)->prio);
+}
+
 static int  __init plist_test(void)
 {
         int nr_expect = 0, i, loop;
         unsigned int r = local_clock();
 
-        pr_debug("start plist test\n");
+        printk(KERN_DEBUG "start plist test\n");
         plist_head_init(&test_head);
         for (i = 0; i < ARRAY_SIZE(test_node); i++)
                 plist_node_init(test_node + i, 0);
@@ -193,6 +241,10 @@ static int  __init plist_test(void)
                         nr_expect--;
                 }
                 plist_test_check(nr_expect);
+                if (!plist_node_empty(test_node + i)) {
+                        plist_test_requeue(test_node + i);
+                        plist_test_check(nr_expect);
+                }
         }
 
         for (i = 0; i < ARRAY_SIZE(test_node); i++) {
@@ -203,7 +255,7 @@ static int  __init plist_test(void)
                 plist_test_check(nr_expect);
         }
 
-        pr_debug("end plist test\n");
+        printk(KERN_DEBUG "end plist test\n");
         return 0;
 }
 
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 9599aa72d7a0..3291a8e37490 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -27,6 +27,7 @@
 #include <linux/radix-tree.h>
 #include <linux/percpu.h>
 #include <linux/slab.h>
+#include <linux/kmemleak.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/string.h>
@@ -194,12 +195,17 @@ radix_tree_node_alloc(struct radix_tree_root *root)
                  * succeed in getting a node here (and never reach
                  * kmem_cache_alloc)
                  */
-                rtp = &__get_cpu_var(radix_tree_preloads);
+                rtp = this_cpu_ptr(&radix_tree_preloads);
                 if (rtp->nr) {
                         ret = rtp->nodes[rtp->nr - 1];
                         rtp->nodes[rtp->nr - 1] = NULL;
                         rtp->nr--;
                 }
+                /*
+                 * Update the allocation stack trace as this is more useful
+                 * for debugging.
+                 */
+                kmemleak_update_trace(ret);
         }
         if (ret == NULL)
                 ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
@@ -250,14 +256,14 @@ static int __radix_tree_preload(gfp_t gfp_mask)
         int ret = -ENOMEM;
 
         preempt_disable();
-        rtp = &__get_cpu_var(radix_tree_preloads);
+        rtp = this_cpu_ptr(&radix_tree_preloads);
         while (rtp->nr < ARRAY_SIZE(rtp->nodes)) {
                 preempt_enable();
                 node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
                 if (node == NULL)
                         goto out;
                 preempt_disable();
-                rtp = &__get_cpu_var(radix_tree_preloads);
+                rtp = this_cpu_ptr(&radix_tree_preloads);
                 if (rtp->nr < ARRAY_SIZE(rtp->nodes))
                         rtp->nodes[rtp->nr++] = node;
                 else
@@ -1296,7 +1302,6 @@ static inline void radix_tree_shrink(struct radix_tree_root *root)
 /**
  *      __radix_tree_delete_node    -    try to free node after clearing a slot
  *      @root:          radix tree root
- *      @index:         index key
  *      @node:          node containing @index
  *
  *      After clearing the slot at @index in @node from radix tree
diff --git a/lib/string.c b/lib/string.c
index 9b1f9062a202..992bf30af759 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -107,7 +107,7 @@ EXPORT_SYMBOL(strcpy);
 
 #ifndef __HAVE_ARCH_STRNCPY
 /**
- * strncpy - Copy a length-limited, %NUL-terminated string
+ * strncpy - Copy a length-limited, C-string
  * @dest: Where to copy the string to
  * @src: Where to copy the string from
  * @count: The maximum number of bytes to copy
@@ -136,7 +136,7 @@ EXPORT_SYMBOL(strncpy);
 
 #ifndef __HAVE_ARCH_STRLCPY
 /**
- * strlcpy - Copy a %NUL terminated string into a sized buffer
+ * strlcpy - Copy a C-string into a sized buffer
  * @dest: Where to copy the string to
  * @src: Where to copy the string from
  * @size: size of destination buffer
@@ -182,7 +182,7 @@ EXPORT_SYMBOL(strcat);
 
 #ifndef __HAVE_ARCH_STRNCAT
 /**
- * strncat - Append a length-limited, %NUL-terminated string to another
+ * strncat - Append a length-limited, C-string to another
  * @dest: The string to be appended to
  * @src: The string to append to it
  * @count: The maximum numbers of bytes to copy
@@ -211,7 +211,7 @@ EXPORT_SYMBOL(strncat);
 
 #ifndef __HAVE_ARCH_STRLCAT
 /**
- * strlcat - Append a length-limited, %NUL-terminated string to another
+ * strlcat - Append a length-limited, C-string to another
  * @dest: The string to be appended to
  * @src: The string to append to it
  * @count: The size of the destination buffer.
@@ -301,6 +301,24 @@ char *strchr(const char *s, int c)
 EXPORT_SYMBOL(strchr);
 #endif
 
+#ifndef __HAVE_ARCH_STRCHRNUL
+/**
+ * strchrnul - Find and return a character in a string, or end of string
+ * @s: The string to be searched
+ * @c: The character to search for
+ *
+ * Returns pointer to first occurrence of 'c' in s. If c is not found, then
+ * return a pointer to the null byte at the end of s.
+ */
+char *strchrnul(const char *s, int c)
+{
+        while (*s && *s != (char)c)
+                s++;
+        return (char *)s;
+}
+EXPORT_SYMBOL(strchrnul);
+#endif
+
 #ifndef __HAVE_ARCH_STRRCHR
 /**
  * strrchr - Find the last occurrence of a character in a string
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index b604b831f4d1..649d097853a1 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -374,7 +374,7 @@ void __init swiotlb_free(void)
         io_tlb_nslabs = 0;
 }
 
-static int is_swiotlb_buffer(phys_addr_t paddr)
+int is_swiotlb_buffer(phys_addr_t paddr)
 {
         return paddr >= io_tlb_start && paddr < io_tlb_end;
 }
diff --git a/lib/textsearch.c b/lib/textsearch.c
index e0cc0146ae62..0c7e9ab2d88f 100644
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -159,6 +159,7 @@ errout:
         spin_unlock(&ts_mod_lock);
         return err;
 }
+EXPORT_SYMBOL(textsearch_register);
 
 /**
  * textsearch_unregister - unregister a textsearch module
@@ -190,6 +191,7 @@ out:
         spin_unlock(&ts_mod_lock);
         return err;
 }
+EXPORT_SYMBOL(textsearch_unregister);
 
 struct ts_linear_state
 {
@@ -236,6 +238,7 @@ unsigned int textsearch_find_continuous(struct ts_config *conf,
 
         return textsearch_find(conf, state);
 }
+EXPORT_SYMBOL(textsearch_find_continuous);
 
 /**
  * textsearch_prepare - Prepare a search
@@ -298,6 +301,7 @@ errout:
                 
         return ERR_PTR(err);
 }
+EXPORT_SYMBOL(textsearch_prepare);
 
 /**
  * textsearch_destroy - destroy a search configuration
@@ -316,9 +320,4 @@ void textsearch_destroy(struct ts_config *conf)
 
         kfree(conf);
 }
-
-EXPORT_SYMBOL(textsearch_register);
-EXPORT_SYMBOL(textsearch_unregister);
-EXPORT_SYMBOL(textsearch_prepare);
-EXPORT_SYMBOL(textsearch_find_continuous);
 EXPORT_SYMBOL(textsearch_destroy);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0648291cdafe..6fe2c84eb055 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -2347,7 +2347,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                         break;
 
                 base = 10;
-                is_sign = 0;
+                is_sign = false;
 
                 switch (*fmt++) {
                 case 'c':
@@ -2386,7 +2386,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 case 'i':
                         base = 0;
                 case 'd':
-                        is_sign = 1;
+                        is_sign = true;
                 case 'u':
                         break;
                 case '%':
diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 08837db52d94..12d2d777f36b 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -9,33 +9,33 @@ config XZ_DEC
 if XZ_DEC
 
 config XZ_DEC_X86
-        bool "x86 BCJ filter decoder"
-        default y if X86
+        bool "x86 BCJ filter decoder" if EXPERT
+        default y
         select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
-        bool "PowerPC BCJ filter decoder"
-        default y if PPC
+        bool "PowerPC BCJ filter decoder" if EXPERT
+        default y
         select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
-        bool "IA-64 BCJ filter decoder"
-        default y if IA64
+        bool "IA-64 BCJ filter decoder" if EXPERT
+        default y
         select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
-        bool "ARM BCJ filter decoder"
-        default y if ARM
+        bool "ARM BCJ filter decoder" if EXPERT
+        default y
         select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
-        bool "ARM-Thumb BCJ filter decoder"
-        default y if (ARM && ARM_THUMB)
+        bool "ARM-Thumb BCJ filter decoder" if EXPERT
+        default y
         select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
-        bool "SPARC BCJ filter decoder"
-        default y if SPARC
+        bool "SPARC BCJ filter decoder" if EXPERT
+        default y
         select XZ_DEC_BCJ
 
 endif
diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c
index a6cdc969ea42..08c3c8049998 100644
--- a/lib/xz/xz_dec_lzma2.c
+++ b/lib/xz/xz_dec_lzma2.c
@@ -1043,6 +1043,8 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
 
                         s->lzma2.sequence = SEQ_LZMA_PREPARE;
 
+                /* Fall through */
+
                 case SEQ_LZMA_PREPARE:
                         if (s->lzma2.compressed < RC_INIT_BYTES)
                                 return XZ_DATA_ERROR;
@@ -1053,6 +1055,8 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
                         s->lzma2.compressed -= RC_INIT_BYTES;
                         s->lzma2.sequence = SEQ_LZMA_RUN;
 
+                /* Fall through */
+
                 case SEQ_LZMA_RUN:
                         /*
                          * Set dictionary limit to indicate how much we want