20 files changed, 284 insertions, 151 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 25c19678a30f..6c695ff9caba 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -79,6 +79,13 @@ config LIBCRC32C
           require M here.  See Castagnoli93.
           Module will be libcrc32c.
 
+config CRC8
+        tristate "CRC8 function"
+        help
+          This option provides CRC8 function. Drivers may select this
+          when they need to do cyclic redundancy check according CRC8
+          algorithm. Module will be called crc8.
+
 config AUDIT_GENERIC
         bool
         depends on AUDIT && !AUDIT_ARCH
@@ -262,6 +269,13 @@ config AVERAGE
 
           If unsure, say N.
 
+config CORDIC
+        tristate "Cordic function"
+        help
+          The option provides arithmetic function using cordic algorithm
+          so its calculations are in fixed point. Modules can select this
+          when they require this function. Module will be called cordic.
+
 config LLIST
         bool
 
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index dd373c8ee943..c0cb9c4bc46d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -227,7 +227,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
 config DETECT_HUNG_TASK
         bool "Detect Hung Tasks"
         depends on DEBUG_KERNEL
-        default DETECT_SOFTLOCKUP
+        default LOCKUP_DETECTOR
         help
           Say Y here to enable the kernel to detect "hung tasks",
           which are bugs that cause the task to be stuck in
@@ -648,12 +648,15 @@ config TRACE_IRQFLAGS
           Enables hooks to interrupt enabling and disabling for
           either tracing or lock debugging.
 
-config DEBUG_SPINLOCK_SLEEP
-        bool "Spinlock debugging: sleep-inside-spinlock checking"
+config DEBUG_ATOMIC_SLEEP
+        bool "Sleep inside atomic section checking"
+        select PREEMPT_COUNT
         depends on DEBUG_KERNEL
         help
           If you say Y here, various routines which may sleep will become very
-          noisy if they are called with a spinlock held.
+          noisy if they are called inside atomic sections: when a spinlock is
+          held, inside an rcu read side critical section, inside preempt disabled
+          sections, inside an interrupt, etc...
 
 config DEBUG_LOCKING_API_SELFTESTS
         bool "Locking API boot-time self-tests"
@@ -866,7 +869,7 @@ config BOOT_PRINTK_DELAY
           system, and then set "lpj=M" before setting "boot_delay=N".
           NOTE:  Using this option may adversely affect SMP systems.
           I.e., processors other than the first one may not boot up.
-          BOOT_PRINTK_DELAY also may cause DETECT_SOFTLOCKUP to detect
+          BOOT_PRINTK_DELAY also may cause LOCKUP_DETECTOR to detect
           what it believes to be lockup conditions.
 
 config RCU_TORTURE_TEST
diff --git a/lib/Makefile b/lib/Makefile
index d770b817202e..6457af4a7caf 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_CRC_ITU_T)	+= crc-itu-t.o
 obj-$(CONFIG_CRC32)     += crc32.o
 obj-$(CONFIG_CRC7)      += crc7.o
 obj-$(CONFIG_LIBCRC32C) += libcrc32c.o
+obj-$(CONFIG_CRC8)      += crc8.o
 obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o
 
 obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
@@ -112,6 +113,8 @@ obj-$(CONFIG_AVERAGE) += average.o
 
 obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o
 
+obj-$(CONFIG_CORDIC) += cordic.o
+
 obj-$(CONFIG_LLIST) += llist.o
 
 hostprogs-y     := gen_crc32table
diff --git a/lib/atomic64.c b/lib/atomic64.c
index a21c12bc727c..e12ae0dd08a8 100644
--- a/lib/atomic64.c
+++ b/lib/atomic64.c
@@ -14,7 +14,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /*
  * We use a hashed array of spinlocks to provide exclusive access
diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c
index 44524cc8c32a..0c33cde2a1e6 100644
--- a/lib/atomic64_test.c
+++ b/lib/atomic64_test.c
@@ -10,7 +10,7 @@
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #define INIT(c) do { atomic64_set(&v, c); r = c; } while (0)
 static __init int test_atomic64(void)
diff --git a/lib/bitmap.c b/lib/bitmap.c
index e3c9e999501e..2f4412e4d071 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -754,7 +754,7 @@ static int bitmap_pos_to_ord(const unsigned long *buf, int pos, int bits)
  *
  * The bit positions 0 through @bits are valid positions in @buf.
  */
-static int bitmap_ord_to_pos(const unsigned long *buf, int ord, int bits)
+int bitmap_ord_to_pos(const unsigned long *buf, int ord, int bits)
 {
         int pos = 0;
 
diff --git a/lib/checksum.c b/lib/checksum.c
index 097508732f34..8df2f91e6d98 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -49,7 +49,7 @@ static inline unsigned short from32to16(unsigned int x)
 
 static unsigned int do_csum(const unsigned char *buff, int len)
 {
-        int odd, count;
+        int odd;
         unsigned int result = 0;
 
         if (len <= 0)
@@ -64,25 +64,22 @@ static unsigned int do_csum(const unsigned char *buff, int len)
                 len--;
                 buff++;
         }
-        count = len >> 1;               /* nr of 16-bit words.. */
-        if (count) {
+        if (len >= 2) {
                 if (2 & (unsigned long) buff) {
                         result += *(unsigned short *) buff;
-                        count--;
                         len -= 2;
                         buff += 2;
                 }
-                count >>= 1;            /* nr of 32-bit words.. */
-                if (count) {
+                if (len >= 4) {
+                        const unsigned char *end = buff + ((unsigned)len & ~3);
                         unsigned int carry = 0;
                         do {
                                 unsigned int w = *(unsigned int *) buff;
-                                count--;
                                 buff += 4;
                                 result += carry;
                                 result += w;
                                 carry = (w > result);
-                        } while (count);
+                        } while (buff < end);
                         result += carry;
                         result = (result & 0xffff) + (result >> 16);
                 }
diff --git a/lib/cordic.c b/lib/cordic.c
new file mode 100644
index 000000000000..aa27a88d7e04
--- /dev/null
+++ b/lib/cordic.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2011 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <linux/module.h>
+#include <linux/cordic.h>
+
+#define CORDIC_ANGLE_GEN        39797
+#define CORDIC_PRECISION_SHIFT  16
+#define CORDIC_NUM_ITER         (CORDIC_PRECISION_SHIFT + 2)
+
+#define FIXED(X)        ((s32)((X) << CORDIC_PRECISION_SHIFT))
+#define FLOAT(X)        (((X) >= 0) \
+                ? ((((X) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1) \
+                : -((((-(X)) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1))
+
+static const s32 arctan_table[] = {
+        2949120,
+        1740967,
+        919879,
+        466945,
+        234379,
+        117304,
+        58666,
+        29335,
+        14668,
+        7334,
+        3667,
+        1833,
+        917,
+        458,
+        229,
+        115,
+        57,
+        29
+};
+
+/*
+ * cordic_calc_iq() - calculates the i/q coordinate for given angle
+ *
+ * theta: angle in degrees for which i/q coordinate is to be calculated
+ * coord: function output parameter holding the i/q coordinate
+ */
+struct cordic_iq cordic_calc_iq(s32 theta)
+{
+        struct cordic_iq coord;
+        s32 angle, valtmp;
+        unsigned iter;
+        int signx = 1;
+        int signtheta;
+
+        coord.i = CORDIC_ANGLE_GEN;
+        coord.q = 0;
+        angle = 0;
+
+        theta = FIXED(theta);
+        signtheta = (theta < 0) ? -1 : 1;
+        theta = ((theta + FIXED(180) * signtheta) % FIXED(360)) -
+                FIXED(180) * signtheta;
+
+        if (FLOAT(theta) > 90) {
+                theta -= FIXED(180);
+                signx = -1;
+        } else if (FLOAT(theta) < -90) {
+                theta += FIXED(180);
+                signx = -1;
+        }
+
+        for (iter = 0; iter < CORDIC_NUM_ITER; iter++) {
+                if (theta > angle) {
+                        valtmp = coord.i - (coord.q >> iter);
+                        coord.q += (coord.i >> iter);
+                        angle += arctan_table[iter];
+                } else {
+                        valtmp = coord.i + (coord.q >> iter);
+                        coord.q -= (coord.i >> iter);
+                        angle -= arctan_table[iter];
+                }
+                coord.i = valtmp;
+        }
+
+        coord.i *= signx;
+        coord.q *= signx;
+        return coord;
+}
+EXPORT_SYMBOL(cordic_calc_iq);
+
+MODULE_DESCRIPTION("Cordic functions");
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/cpumask.c b/lib/cpumask.c
index 05d6aca7fc19..af3e5817de98 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -30,7 +30,7 @@ int __any_online_cpu(const cpumask_t *mask)
 {
         int cpu;
 
-        for_each_cpu_mask(cpu, *mask) {
+        for_each_cpu(cpu, mask) {
                 if (cpu_online(cpu))
                         break;
         }
@@ -131,7 +131,7 @@ EXPORT_SYMBOL(zalloc_cpumask_var_node);
  */
 bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)
 {
-        return alloc_cpumask_var_node(mask, flags, numa_node_id());
+        return alloc_cpumask_var_node(mask, flags, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(alloc_cpumask_var);
 
diff --git a/lib/crc32.c b/lib/crc32.c
index 4855995fcde9..a6e633a48cea 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -26,7 +26,7 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "crc32defs.h"
 #if CRC_LE_BITS == 8
 # define tole(x) __constant_cpu_to_le32(x)
diff --git a/lib/crc8.c b/lib/crc8.c
new file mode 100644
index 000000000000..87b59cafdb83
--- /dev/null
+++ b/lib/crc8.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2011 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/crc8.h>
+#include <linux/printk.h>
+
+/*
+ * crc8_populate_msb - fill crc table for given polynomial in reverse bit order.
+ *
+ * table:       table to be filled.
+ * polynomial:  polynomial for which table is to be filled.
+ */
+void crc8_populate_msb(u8 table[CRC8_TABLE_SIZE], u8 polynomial)
+{
+        int i, j;
+        const u8 msbit = 0x80;
+        u8 t = msbit;
+
+        table[0] = 0;
+
+        for (i = 1; i < CRC8_TABLE_SIZE; i *= 2) {
+                t = (t << 1) ^ (t & msbit ? polynomial : 0);
+                for (j = 0; j < i; j++)
+                        table[i+j] = table[j] ^ t;
+        }
+}
+EXPORT_SYMBOL(crc8_populate_msb);
+
+/*
+ * crc8_populate_lsb - fill crc table for given polynomial in regular bit order.
+ *
+ * table:       table to be filled.
+ * polynomial:  polynomial for which table is to be filled.
+ */
+void crc8_populate_lsb(u8 table[CRC8_TABLE_SIZE], u8 polynomial)
+{
+        int i, j;
+        u8 t = 1;
+
+        table[0] = 0;
+
+        for (i = (CRC8_TABLE_SIZE >> 1); i; i >>= 1) {
+                t = (t >> 1) ^ (t & 1 ? polynomial : 0);
+                for (j = 0; j < CRC8_TABLE_SIZE; j += 2*i)
+                        table[i+j] = table[j] ^ t;
+        }
+}
+EXPORT_SYMBOL(crc8_populate_lsb);
+
+/*
+ * crc8 - calculate a crc8 over the given input data.
+ *
+ * table: crc table used for calculation.
+ * pdata: pointer to data buffer.
+ * nbytes: number of bytes in data buffer.
+ * crc: previous returned crc8 value.
+ */
+u8 crc8(const u8 table[CRC8_TABLE_SIZE], u8 *pdata, size_t nbytes, u8 crc)
+{
+        /* loop over the buffer data */
+        while (nbytes-- > 0)
+                crc = table[(crc ^ *pdata++) & 0xff];
+
+        return crc;
+}
+EXPORT_SYMBOL(crc8);
+
+MODULE_DESCRIPTION("CRC8 (by Williams, Ross N.) function");
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/dec_and_lock.c b/lib/dec_and_lock.c
index e73822aa6e9a..b5257725daad 100644
--- a/lib/dec_and_lock.c
+++ b/lib/dec_and_lock.c
@@ -1,6 +1,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /*
  * This is an implementation of the notion of "decrement a
diff --git a/lib/devres.c b/lib/devres.c
index 6efddf53b90c..7c0e953a7486 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -79,9 +79,9 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
  */
 void devm_iounmap(struct device *dev, void __iomem *addr)
 {
-        iounmap(addr);
         WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
                                (void *)addr));
+        iounmap(addr);
 }
 EXPORT_SYMBOL(devm_iounmap);
 
diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index 7e65af70635e..2577b121c7c1 100644
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -8,7 +8,6 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/stacktrace.h>
-#include <linux/kallsyms.h>
 #include <linux/fault-inject.h>
 
 /*
@@ -140,16 +139,6 @@ static int debugfs_ul_set(void *data, u64 val)
         return 0;
 }
 
-#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
-static int debugfs_ul_set_MAX_STACK_TRACE_DEPTH(void *data, u64 val)
-{
-        *(unsigned long *)data =
-                val < MAX_STACK_TRACE_DEPTH ?
-                val : MAX_STACK_TRACE_DEPTH;
-        return 0;
-}
-#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
-
 static int debugfs_ul_get(void *data, u64 *val)
 {
         *val = *(unsigned long *)data;
@@ -165,16 +154,26 @@ static struct dentry *debugfs_create_ul(const char *name, mode_t mode,
 }
 
 #ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
-DEFINE_SIMPLE_ATTRIBUTE(fops_ul_MAX_STACK_TRACE_DEPTH, debugfs_ul_get,
-                        debugfs_ul_set_MAX_STACK_TRACE_DEPTH, "%llu\n");
 
-static struct dentry *debugfs_create_ul_MAX_STACK_TRACE_DEPTH(
+static int debugfs_stacktrace_depth_set(void *data, u64 val)
+{
+        *(unsigned long *)data =
+                min_t(unsigned long, val, MAX_STACK_TRACE_DEPTH);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(fops_stacktrace_depth, debugfs_ul_get,
+                        debugfs_stacktrace_depth_set, "%llu\n");
+
+static struct dentry *debugfs_create_stacktrace_depth(
         const char *name, mode_t mode,
         struct dentry *parent, unsigned long *value)
 {
         return debugfs_create_file(name, mode, parent, value,
-                                   &fops_ul_MAX_STACK_TRACE_DEPTH);
+                                   &fops_stacktrace_depth);
 }
+
 #endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
 static int debugfs_atomic_t_set(void *data, u64 val)
@@ -200,48 +199,7 @@ static struct dentry *debugfs_create_atomic_t(const char *name, mode_t mode,
 
 void cleanup_fault_attr_dentries(struct fault_attr *attr)
 {
-        debugfs_remove(attr->dentries.probability_file);
-        attr->dentries.probability_file = NULL;
-
-        debugfs_remove(attr->dentries.interval_file);
-        attr->dentries.interval_file = NULL;
-
-        debugfs_remove(attr->dentries.times_file);
-        attr->dentries.times_file = NULL;
-
-        debugfs_remove(attr->dentries.space_file);
-        attr->dentries.space_file = NULL;
-
-        debugfs_remove(attr->dentries.verbose_file);
-        attr->dentries.verbose_file = NULL;
-
-        debugfs_remove(attr->dentries.task_filter_file);
-        attr->dentries.task_filter_file = NULL;
-
-#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
-
-        debugfs_remove(attr->dentries.stacktrace_depth_file);
-        attr->dentries.stacktrace_depth_file = NULL;
-
-        debugfs_remove(attr->dentries.require_start_file);
-        attr->dentries.require_start_file = NULL;
-
-        debugfs_remove(attr->dentries.require_end_file);
-        attr->dentries.require_end_file = NULL;
-
-        debugfs_remove(attr->dentries.reject_start_file);
-        attr->dentries.reject_start_file = NULL;
-
-        debugfs_remove(attr->dentries.reject_end_file);
-        attr->dentries.reject_end_file = NULL;
-
-#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
-
-        if (attr->dentries.dir)
-                WARN_ON(!simple_empty(attr->dentries.dir));
-
-        debugfs_remove(attr->dentries.dir);
-        attr->dentries.dir = NULL;
+        debugfs_remove_recursive(attr->dir);
 }
 
 int init_fault_attr_dentries(struct fault_attr *attr, const char *name)
@@ -249,66 +207,46 @@ int init_fault_attr_dentries(struct fault_attr *attr, const char *name)
         mode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
         struct dentry *dir;
 
-        memset(&attr->dentries, 0, sizeof(attr->dentries));
-
         dir = debugfs_create_dir(name, NULL);
         if (!dir)
-                goto fail;
-        attr->dentries.dir = dir;
-
-        attr->dentries.probability_file =
-                debugfs_create_ul("probability", mode, dir, &attr->probability);
+                return -ENOMEM;
 
-        attr->dentries.interval_file =
-                debugfs_create_ul("interval", mode, dir, &attr->interval);
+        attr->dir = dir;
 
-        attr->dentries.times_file =
-                debugfs_create_atomic_t("times", mode, dir, &attr->times);
-
-        attr->dentries.space_file =
-                debugfs_create_atomic_t("space", mode, dir, &attr->space);
-
-        attr->dentries.verbose_file =
-                debugfs_create_ul("verbose", mode, dir, &attr->verbose);
-
-        attr->dentries.task_filter_file = debugfs_create_bool("task-filter",
-                                                mode, dir, &attr->task_filter);
-
-        if (!attr->dentries.probability_file || !attr->dentries.interval_file ||
-            !attr->dentries.times_file || !attr->dentries.space_file ||
-            !attr->dentries.verbose_file || !attr->dentries.task_filter_file)
+        if (!debugfs_create_ul("probability", mode, dir, &attr->probability))
+                goto fail;
+        if (!debugfs_create_ul("interval", mode, dir, &attr->interval))
+                goto fail;
+        if (!debugfs_create_atomic_t("times", mode, dir, &attr->times))
+                goto fail;
+        if (!debugfs_create_atomic_t("space", mode, dir, &attr->space))
+                goto fail;
+        if (!debugfs_create_ul("verbose", mode, dir, &attr->verbose))
+                goto fail;
+        if (!debugfs_create_bool("task-filter", mode, dir, &attr->task_filter))
                 goto fail;
 
 #ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
 
-        attr->dentries.stacktrace_depth_file =
-                debugfs_create_ul_MAX_STACK_TRACE_DEPTH(
-                        "stacktrace-depth", mode, dir, &attr->stacktrace_depth);
-
-        attr->dentries.require_start_file =
-                debugfs_create_ul("require-start", mode, dir, &attr->require_start);
-
-        attr->dentries.require_end_file =
-                debugfs_create_ul("require-end", mode, dir, &attr->require_end);
-
-        attr->dentries.reject_start_file =
-                debugfs_create_ul("reject-start", mode, dir, &attr->reject_start);
-
-        attr->dentries.reject_end_file =
-                debugfs_create_ul("reject-end", mode, dir, &attr->reject_end);
-
-        if (!attr->dentries.stacktrace_depth_file ||
-            !attr->dentries.require_start_file ||
-            !attr->dentries.require_end_file ||
-            !attr->dentries.reject_start_file ||
-            !attr->dentries.reject_end_file)
+        if (!debugfs_create_stacktrace_depth("stacktrace-depth", mode, dir,
+                                &attr->stacktrace_depth))
+                goto fail;
+        if (!debugfs_create_ul("require-start", mode, dir,
+                                &attr->require_start))
+                goto fail;
+        if (!debugfs_create_ul("require-end", mode, dir, &attr->require_end))
+                goto fail;
+        if (!debugfs_create_ul("reject-start", mode, dir, &attr->reject_start))
+                goto fail;
+        if (!debugfs_create_ul("reject-end", mode, dir, &attr->reject_end))
                 goto fail;
 
 #endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
         return 0;
 fail:
-        cleanup_fault_attr_dentries(attr);
+        debugfs_remove_recursive(attr->dir);
+
         return -ENOMEM;
 }
 
diff --git a/lib/iomap.c b/lib/iomap.c
index d32229385151..5dbcb4b2d864 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -224,6 +224,7 @@ EXPORT_SYMBOL(iowrite8_rep);
 EXPORT_SYMBOL(iowrite16_rep);
 EXPORT_SYMBOL(iowrite32_rep);
 
+#ifdef CONFIG_HAS_IOPORT
 /* Create a virtual mapping cookie for an IO port range */
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
@@ -238,7 +239,9 @@ void ioport_unmap(void __iomem *addr)
 }
 EXPORT_SYMBOL(ioport_map);
 EXPORT_SYMBOL(ioport_unmap);
+#endif /* CONFIG_HAS_IOPORT */
 
+#ifdef CONFIG_PCI
 /**
  * pci_iomap - create a virtual mapping cookie for a PCI BAR
  * @dev: PCI device that owns the BAR
@@ -280,3 +283,4 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
 }
 EXPORT_SYMBOL(pci_iomap);
 EXPORT_SYMBOL(pci_iounmap);
+#endif /* CONFIG_PCI */
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index 2dbae88090ac..5e066759f551 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -19,11 +19,6 @@
 #include <linux/types.h>
 #include <asm/uaccess.h>
 
-static inline char _tolower(const char c)
-{
-        return c | 0x20;
-}
-
 static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res)
 {
         unsigned long long acc;
diff --git a/lib/lcm.c b/lib/lcm.c
index 157cd88a6ffc..10b5cfcacf6b 100644
--- a/lib/lcm.c
+++ b/lib/lcm.c
@@ -1,6 +1,7 @@
 #include <linux/kernel.h>
 #include <linux/gcd.h>
 #include <linux/module.h>
+#include <linux/lcm.h>
 
 /* Lowest common multiple */
 unsigned long lcm(unsigned long a, unsigned long b)
diff --git a/lib/plist.c b/lib/plist.c
index 0ae7e6431726..a0a4da489c22 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -56,11 +56,6 @@ static void plist_check_list(struct list_head *top)
 
 static void plist_check_head(struct plist_head *head)
 {
-        WARN_ON(head != &test_head && !head->rawlock && !head->spinlock);
-        if (head->rawlock)
-                WARN_ON_SMP(!raw_spin_is_locked(head->rawlock));
-        if (head->spinlock)
-                WARN_ON_SMP(!spin_is_locked(head->spinlock));
         if (!plist_head_empty(head))
                 plist_check_list(&plist_first(head)->prio_list);
         plist_check_list(&head->node_list);
@@ -180,7 +175,7 @@ static int  __init plist_test(void)
         unsigned int r = local_clock();
 
         printk(KERN_INFO "start plist test\n");
-        plist_head_init(&test_head, NULL);
+        plist_head_init(&test_head);
         for (i = 0; i < ARRAY_SIZE(test_node); i++)
                 plist_node_init(test_node + i, 0);
 
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 4365df31a1d5..d7222a9c8267 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -31,13 +31,10 @@
 #include <asm/div64.h>
 #include <asm/sections.h>       /* for dereference_function_descriptor() */
 
-/* Works only for digits and letters, but small and fast */
-#define TOLOWER(x) ((x) | 0x20)
-
 static unsigned int simple_guess_base(const char *cp)
 {
         if (cp[0] == '0') {
-                if (TOLOWER(cp[1]) == 'x' && isxdigit(cp[2]))
+                if (_tolower(cp[1]) == 'x' && isxdigit(cp[2]))
                         return 16;
                 else
                         return 8;
@@ -59,13 +56,13 @@ unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int bas
         if (!base)
                 base = simple_guess_base(cp);
 
-        if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
+        if (base == 16 && cp[0] == '0' && _tolower(cp[1]) == 'x')
                 cp += 2;
 
         while (isxdigit(*cp)) {
                 unsigned int value;
 
-                value = isdigit(*cp) ? *cp - '0' : TOLOWER(*cp) - 'a' + 10;
+                value = isdigit(*cp) ? *cp - '0' : _tolower(*cp) - 'a' + 10;
                 if (value >= base)
                         break;
                 result = result * base + value;
@@ -1036,8 +1033,8 @@ precision:
 qualifier:
         /* get the conversion qualifier */
         spec->qualifier = -1;
-        if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
-            TOLOWER(*fmt) == 'z' || *fmt == 't') {
+        if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
+            _tolower(*fmt) == 'z' || *fmt == 't') {
                 spec->qualifier = *fmt++;
                 if (unlikely(spec->qualifier == *fmt)) {
                         if (spec->qualifier == 'l') {
@@ -1104,7 +1101,7 @@ qualifier:
                         spec->type = FORMAT_TYPE_LONG;
                 else
                         spec->type = FORMAT_TYPE_ULONG;
-        } else if (TOLOWER(spec->qualifier) == 'z') {
+        } else if (_tolower(spec->qualifier) == 'z') {
                 spec->type = FORMAT_TYPE_SIZE_T;
         } else if (spec->qualifier == 't') {
                 spec->type = FORMAT_TYPE_PTRDIFF;
@@ -1149,8 +1146,7 @@ qualifier:
  * %pi4 print an IPv4 address with leading zeros
  * %pI6 print an IPv6 address with colons
  * %pi6 print an IPv6 address without colons
- * %pI6c print an IPv6 address as specified by
- *   http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
+ * %pI6c print an IPv6 address as specified by RFC 5952
  * %pU[bBlL] print a UUID/GUID in big or little endian using lower or upper
  *   case.
  * %n is ignored
@@ -1263,7 +1259,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                         if (qualifier == 'l') {
                                 long *ip = va_arg(args, long *);
                                 *ip = (str - buf);
-                        } else if (TOLOWER(qualifier) == 'z') {
+                        } else if (_tolower(qualifier) == 'z') {
                                 size_t *ip = va_arg(args, size_t *);
                                 *ip = (str - buf);
                         } else {
@@ -1550,7 +1546,7 @@ do {									\
                         void *skip_arg;
                         if (qualifier == 'l')
                                 skip_arg = va_arg(args, long *);
-                        else if (TOLOWER(qualifier) == 'z')
+                        else if (_tolower(qualifier) == 'z')
                                 skip_arg = va_arg(args, size_t *);
                         else
                                 skip_arg = va_arg(args, int *);
@@ -1856,8 +1852,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
 
                 /* get conversion qualifier */
                 qualifier = -1;
-                if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
-                    TOLOWER(*fmt) == 'z') {
+                if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
+                    _tolower(*fmt) == 'z') {
                         qualifier = *fmt++;
                         if (unlikely(qualifier == *fmt)) {
                                 if (qualifier == 'h') {
diff --git a/lib/xz/xz_private.h b/lib/xz/xz_private.h
index a65633e06962..482b90f363fe 100644
--- a/lib/xz/xz_private.h
+++ b/lib/xz/xz_private.h
@@ -12,7 +12,7 @@
 
 #ifdef __KERNEL__
 #       include <linux/xz.h>
-#       include <asm/byteorder.h>
+#       include <linux/kernel.h>
 #       include <asm/unaligned.h>
         /* XZ_PREBOOT may be defined only via decompress_unxz.c. */
 #       ifndef XZ_PREBOOT