10 files changed, 1076 insertions, 167 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 97b136ff117e..170d8ca901d8 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -160,6 +160,9 @@ config TEXTSEARCH_BM
 config TEXTSEARCH_FSM
         tristate
 
+config BTREE
+        boolean
+
 config HAS_IOMEM
         boolean
         depends on !NO_IOMEM
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 5e3407d997b2..b520ec1f33c5 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -864,8 +864,7 @@ config DEBUG_FORCE_WEAK_PER_CPU
 
 config LKDTM
         tristate "Linux Kernel Dump Test Tool Module"
-        depends on DEBUG_KERNEL
-        depends on KPROBES
+        depends on DEBUG_FS
         depends on BLOCK
         default n
         help
@@ -876,7 +875,7 @@ config LKDTM
         called lkdtm.
 
         Documentation on how to use the module can be found in
-        drivers/misc/lkdtm.c
+        Documentation/fault-injection/provoke-crashes.txt
 
 config FAULT_INJECTION
         bool "Fault-injection framework"
diff --git a/lib/Makefile b/lib/Makefile
index 3b0b4a696db9..2e152aed7198 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,6 +41,7 @@ lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o
 obj-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o
 obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
 obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o
+obj-$(CONFIG_BTREE) += btree.o
 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
 obj-$(CONFIG_DEBUG_LIST) += list_debug.o
 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 11bf49750583..ffb78c916ccd 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -487,7 +487,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
 EXPORT_SYMBOL(__bitmap_parse);
 
 /**
- * bitmap_parse_user()
+ * bitmap_parse_user - convert an ASCII hex string in a user buffer into a bitmap
  *
  * @ubuf: pointer to user buffer containing string.
  * @ulen: buffer size in bytes.  If string is smaller than this
@@ -619,7 +619,7 @@ int bitmap_parselist(const char *bp, unsigned long *maskp, int nmaskbits)
 EXPORT_SYMBOL(bitmap_parselist);
 
 /**
- * bitmap_pos_to_ord(buf, pos, bits)
+ * bitmap_pos_to_ord - find ordinal of set bit at given position in bitmap
  *      @buf: pointer to a bitmap
  *      @pos: a bit position in @buf (0 <= @pos < @bits)
  *      @bits: number of valid bit positions in @buf
@@ -655,7 +655,7 @@ static int bitmap_pos_to_ord(const unsigned long *buf, int pos, int bits)
 }
 
 /**
- * bitmap_ord_to_pos(buf, ord, bits)
+ * bitmap_ord_to_pos - find position of n-th set bit in bitmap
  *      @buf: pointer to bitmap
  *      @ord: ordinal bit position (n-th set bit, n >= 0)
  *      @bits: number of valid bit positions in @buf
@@ -733,10 +733,9 @@ void bitmap_remap(unsigned long *dst, const unsigned long *src,
         bitmap_zero(dst, bits);
 
         w = bitmap_weight(new, bits);
-        for (oldbit = find_first_bit(src, bits);
-             oldbit < bits;
-             oldbit = find_next_bit(src, bits, oldbit + 1)) {
+        for_each_set_bit(oldbit, src, bits) {
                 int n = bitmap_pos_to_ord(old, oldbit, bits);
+
                 if (n < 0 || w == 0)
                         set_bit(oldbit, dst);   /* identity map */
                 else
@@ -903,9 +902,7 @@ void bitmap_onto(unsigned long *dst, const unsigned long *orig,
          */
 
         m = 0;
-        for (n = find_first_bit(relmap, bits);
-             n < bits;
-             n = find_next_bit(relmap, bits, n + 1)) {
+        for_each_set_bit(n, relmap, bits) {
                 /* m == bitmap_pos_to_ord(relmap, n, bits) */
                 if (test_bit(m, orig))
                         set_bit(n, dst);
@@ -934,9 +931,7 @@ void bitmap_fold(unsigned long *dst, const unsigned long *orig,
                 return;
         bitmap_zero(dst, bits);
 
-        for (oldbit = find_first_bit(orig, bits);
-             oldbit < bits;
-             oldbit = find_next_bit(orig, bits, oldbit + 1))
+        for_each_set_bit(oldbit, orig, bits)
                 set_bit(oldbit % sz, dst);
 }
 EXPORT_SYMBOL(bitmap_fold);
diff --git a/lib/btree.c b/lib/btree.c
new file mode 100644
index 000000000000..41859a820218
--- /dev/null
+++ b/lib/btree.c
@@ -0,0 +1,797 @@
+/*
+ * lib/btree.c  - Simple In-memory B+Tree
+ *
+ * As should be obvious for Linux kernel code, license is GPLv2
+ *
+ * Copyright (c) 2007-2008 Joern Engel <joern@logfs.org>
+ * Bits and pieces stolen from Peter Zijlstra's code, which is
+ * Copyright 2007, Red Hat Inc. Peter Zijlstra <pzijlstr@redhat.com>
+ * GPLv2
+ *
+ * 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.
+ *
+ * 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
+ * well is that access to a random tree node is much faster than a large number
+ * of operations within each node.
+ *
+ * Disks have fulfilled the prerequisite for a long time.  More recently DRAM
+ * has gained similar properties, as memory access times, when measured in cpu
+ * cycles, have increased.  Cacheline sizes have increased as well, which also
+ * helps B+Trees.
+ *
+ * Compared to radix trees, B+Trees are more efficient when dealing with a
+ * sparsely populated address space.  Between 25% and 50% of the memory is
+ * occupied with valid pointers.  When densely populated, radix trees contain
+ * ~98% pointers - hard to beat.  Very sparse radix trees contain only ~2%
+ * pointers.
+ *
+ * This particular implementation stores pointers identified by a long value.
+ * Storing NULL pointers is illegal, lookup will return NULL when no entry
+ * was found.
+ *
+ * A tricks was used that is not commonly found in textbooks.  The lowest
+ * values are to the right, not to the left.  All used slots within a node
+ * are on the left, all unused slots contain NUL values.  Most operations
+ * simply loop once over all slots and terminate on the first NUL.
+ */
+
+#include <linux/btree.h>
+#include <linux/cache.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define NODESIZE MAX(L1_CACHE_BYTES, 128)
+
+struct btree_geo {
+        int keylen;
+        int no_pairs;
+        int no_longs;
+};
+
+struct btree_geo btree_geo32 = {
+        .keylen = 1,
+        .no_pairs = NODESIZE / sizeof(long) / 2,
+        .no_longs = NODESIZE / sizeof(long) / 2,
+};
+EXPORT_SYMBOL_GPL(btree_geo32);
+
+#define LONG_PER_U64 (64 / BITS_PER_LONG)
+struct btree_geo btree_geo64 = {
+        .keylen = LONG_PER_U64,
+        .no_pairs = NODESIZE / sizeof(long) / (1 + LONG_PER_U64),
+        .no_longs = LONG_PER_U64 * (NODESIZE / sizeof(long) / (1 + LONG_PER_U64)),
+};
+EXPORT_SYMBOL_GPL(btree_geo64);
+
+struct btree_geo btree_geo128 = {
+        .keylen = 2 * LONG_PER_U64,
+        .no_pairs = NODESIZE / sizeof(long) / (1 + 2 * LONG_PER_U64),
+        .no_longs = 2 * LONG_PER_U64 * (NODESIZE / sizeof(long) / (1 + 2 * LONG_PER_U64)),
+};
+EXPORT_SYMBOL_GPL(btree_geo128);
+
+static struct kmem_cache *btree_cachep;
+
+void *btree_alloc(gfp_t gfp_mask, void *pool_data)
+{
+        return kmem_cache_alloc(btree_cachep, gfp_mask);
+}
+EXPORT_SYMBOL_GPL(btree_alloc);
+
+void btree_free(void *element, void *pool_data)
+{
+        kmem_cache_free(btree_cachep, element);
+}
+EXPORT_SYMBOL_GPL(btree_free);
+
+static unsigned long *btree_node_alloc(struct btree_head *head, gfp_t gfp)
+{
+        unsigned long *node;
+
+        node = mempool_alloc(head->mempool, gfp);
+        memset(node, 0, NODESIZE);
+        return node;
+}
+
+static int longcmp(const unsigned long *l1, const unsigned long *l2, size_t n)
+{
+        size_t i;
+
+        for (i = 0; i < n; i++) {
+                if (l1[i] < l2[i])
+                        return -1;
+                if (l1[i] > l2[i])
+                        return 1;
+        }
+        return 0;
+}
+
+static unsigned long *longcpy(unsigned long *dest, const unsigned long *src,
+                size_t n)
+{
+        size_t i;
+
+        for (i = 0; i < n; i++)
+                dest[i] = src[i];
+        return dest;
+}
+
+static unsigned long *longset(unsigned long *s, unsigned long c, size_t n)
+{
+        size_t i;
+
+        for (i = 0; i < n; i++)
+                s[i] = c;
+        return s;
+}
+
+static void dec_key(struct btree_geo *geo, unsigned long *key)
+{
+        unsigned long val;
+        int i;
+
+        for (i = geo->keylen - 1; i >= 0; i--) {
+                val = key[i];
+                key[i] = val - 1;
+                if (val)
+                        break;
+        }
+}
+
+static unsigned long *bkey(struct btree_geo *geo, unsigned long *node, int n)
+{
+        return &node[n * geo->keylen];
+}
+
+static void *bval(struct btree_geo *geo, unsigned long *node, int n)
+{
+        return (void *)node[geo->no_longs + n];
+}
+
+static void setkey(struct btree_geo *geo, unsigned long *node, int n,
+                   unsigned long *key)
+{
+        longcpy(bkey(geo, node, n), key, geo->keylen);
+}
+
+static void setval(struct btree_geo *geo, unsigned long *node, int n,
+                   void *val)
+{
+        node[geo->no_longs + n] = (unsigned long) val;
+}
+
+static void clearpair(struct btree_geo *geo, unsigned long *node, int n)
+{
+        longset(bkey(geo, node, n), 0, geo->keylen);
+        node[geo->no_longs + n] = 0;
+}
+
+static inline void __btree_init(struct btree_head *head)
+{
+        head->node = NULL;
+        head->height = 0;
+}
+
+void btree_init_mempool(struct btree_head *head, mempool_t *mempool)
+{
+        __btree_init(head);
+        head->mempool = mempool;
+}
+EXPORT_SYMBOL_GPL(btree_init_mempool);
+
+int btree_init(struct btree_head *head)
+{
+        __btree_init(head);
+        head->mempool = mempool_create(0, btree_alloc, btree_free, NULL);
+        if (!head->mempool)
+                return -ENOMEM;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(btree_init);
+
+void btree_destroy(struct btree_head *head)
+{
+        mempool_destroy(head->mempool);
+        head->mempool = NULL;
+}
+EXPORT_SYMBOL_GPL(btree_destroy);
+
+void *btree_last(struct btree_head *head, struct btree_geo *geo,
+                 unsigned long *key)
+{
+        int height = head->height;
+        unsigned long *node = head->node;
+
+        if (height == 0)
+                return NULL;
+
+        for ( ; height > 1; height--)
+                node = bval(geo, node, 0);
+
+        longcpy(key, bkey(geo, node, 0), geo->keylen);
+        return bval(geo, node, 0);
+}
+EXPORT_SYMBOL_GPL(btree_last);
+
+static int keycmp(struct btree_geo *geo, unsigned long *node, int pos,
+                  unsigned long *key)
+{
+        return longcmp(bkey(geo, node, pos), key, geo->keylen);
+}
+
+static int keyzero(struct btree_geo *geo, unsigned long *key)
+{
+        int i;
+
+        for (i = 0; i < geo->keylen; i++)
+                if (key[i])
+                        return 0;
+
+        return 1;
+}
+
+void *btree_lookup(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key)
+{
+        int i, height = head->height;
+        unsigned long *node = head->node;
+
+        if (height == 0)
+                return NULL;
+
+        for ( ; height > 1; height--) {
+                for (i = 0; i < geo->no_pairs; i++)
+                        if (keycmp(geo, node, i, key) <= 0)
+                                break;
+                if (i == geo->no_pairs)
+                        return NULL;
+                node = bval(geo, node, i);
+                if (!node)
+                        return NULL;
+        }
+
+        if (!node)
+                return NULL;
+
+        for (i = 0; i < geo->no_pairs; i++)
+                if (keycmp(geo, node, i, key) == 0)
+                        return bval(geo, node, i);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(btree_lookup);
+
+int btree_update(struct btree_head *head, struct btree_geo *geo,
+                 unsigned long *key, void *val)
+{
+        int i, height = head->height;
+        unsigned long *node = head->node;
+
+        if (height == 0)
+                return -ENOENT;
+
+        for ( ; height > 1; height--) {
+                for (i = 0; i < geo->no_pairs; i++)
+                        if (keycmp(geo, node, i, key) <= 0)
+                                break;
+                if (i == geo->no_pairs)
+                        return -ENOENT;
+                node = bval(geo, node, i);
+                if (!node)
+                        return -ENOENT;
+        }
+
+        if (!node)
+                return -ENOENT;
+
+        for (i = 0; i < geo->no_pairs; i++)
+                if (keycmp(geo, node, i, key) == 0) {
+                        setval(geo, node, i, val);
+                        return 0;
+                }
+        return -ENOENT;
+}
+EXPORT_SYMBOL_GPL(btree_update);
+
+/*
+ * Usually this function is quite similar to normal lookup.  But the key of
+ * a parent node may be smaller than the smallest key of all its siblings.
+ * In such a case we cannot just return NULL, as we have only proven that no
+ * key smaller than __key, but larger than this parent key exists.
+ * So we set __key to the parent key and retry.  We have to use the smallest
+ * such parent key, which is the last parent key we encountered.
+ */
+void *btree_get_prev(struct btree_head *head, struct btree_geo *geo,
+                     unsigned long *__key)
+{
+        int i, height;
+        unsigned long *node, *oldnode;
+        unsigned long *retry_key = NULL, key[geo->keylen];
+
+        if (keyzero(geo, __key))
+                return NULL;
+
+        if (head->height == 0)
+                return NULL;
+retry:
+        longcpy(key, __key, geo->keylen);
+        dec_key(geo, key);
+
+        node = head->node;
+        for (height = head->height ; height > 1; height--) {
+                for (i = 0; i < geo->no_pairs; i++)
+                        if (keycmp(geo, node, i, key) <= 0)
+                                break;
+                if (i == geo->no_pairs)
+                        goto miss;
+                oldnode = node;
+                node = bval(geo, node, i);
+                if (!node)
+                        goto miss;
+                retry_key = bkey(geo, oldnode, i);
+        }
+
+        if (!node)
+                goto miss;
+
+        for (i = 0; i < geo->no_pairs; i++) {
+                if (keycmp(geo, node, i, key) <= 0) {
+                        if (bval(geo, node, i)) {
+                                longcpy(__key, bkey(geo, node, i), geo->keylen);
+                                return bval(geo, node, i);
+                        } else
+                                goto miss;
+                }
+        }
+miss:
+        if (retry_key) {
+                __key = retry_key;
+                retry_key = NULL;
+                goto retry;
+        }
+        return NULL;
+}
+
+static int getpos(struct btree_geo *geo, unsigned long *node,
+                unsigned long *key)
+{
+        int i;
+
+        for (i = 0; i < geo->no_pairs; i++) {
+                if (keycmp(geo, node, i, key) <= 0)
+                        break;
+        }
+        return i;
+}
+
+static int getfill(struct btree_geo *geo, unsigned long *node, int start)
+{
+        int i;
+
+        for (i = start; i < geo->no_pairs; i++)
+                if (!bval(geo, node, i))
+                        break;
+        return i;
+}
+
+/*
+ * locate the correct leaf node in the btree
+ */
+static unsigned long *find_level(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key, int level)
+{
+        unsigned long *node = head->node;
+        int i, height;
+
+        for (height = head->height; height > level; height--) {
+                for (i = 0; i < geo->no_pairs; i++)
+                        if (keycmp(geo, node, i, key) <= 0)
+                                break;
+
+                if ((i == geo->no_pairs) || !bval(geo, node, i)) {
+                        /* right-most key is too large, update it */
+                        /* FIXME: If the right-most key on higher levels is
+                         * always zero, this wouldn't be necessary. */
+                        i--;
+                        setkey(geo, node, i, key);
+                }
+                BUG_ON(i < 0);
+                node = bval(geo, node, i);
+        }
+        BUG_ON(!node);
+        return node;
+}
+
+static int btree_grow(struct btree_head *head, struct btree_geo *geo,
+                      gfp_t gfp)
+{
+        unsigned long *node;
+        int fill;
+
+        node = btree_node_alloc(head, gfp);
+        if (!node)
+                return -ENOMEM;
+        if (head->node) {
+                fill = getfill(geo, head->node, 0);
+                setkey(geo, node, 0, bkey(geo, head->node, fill - 1));
+                setval(geo, node, 0, head->node);
+        }
+        head->node = node;
+        head->height++;
+        return 0;
+}
+
+static void btree_shrink(struct btree_head *head, struct btree_geo *geo)
+{
+        unsigned long *node;
+        int fill;
+
+        if (head->height <= 1)
+                return;
+
+        node = head->node;
+        fill = getfill(geo, node, 0);
+        BUG_ON(fill > 1);
+        head->node = bval(geo, node, 0);
+        head->height--;
+        mempool_free(node, head->mempool);
+}
+
+static int btree_insert_level(struct btree_head *head, struct btree_geo *geo,
+                              unsigned long *key, void *val, int level,
+                              gfp_t gfp)
+{
+        unsigned long *node;
+        int i, pos, fill, err;
+
+        BUG_ON(!val);
+        if (head->height < level) {
+                err = btree_grow(head, geo, gfp);
+                if (err)
+                        return err;
+        }
+
+retry:
+        node = find_level(head, geo, key, level);
+        pos = getpos(geo, node, key);
+        fill = getfill(geo, node, pos);
+        /* two identical keys are not allowed */
+        BUG_ON(pos < fill && keycmp(geo, node, pos, key) == 0);
+
+        if (fill == geo->no_pairs) {
+                /* need to split node */
+                unsigned long *new;
+
+                new = btree_node_alloc(head, gfp);
+                if (!new)
+                        return -ENOMEM;
+                err = btree_insert_level(head, geo,
+                                bkey(geo, node, fill / 2 - 1),
+                                new, level + 1, gfp);
+                if (err) {
+                        mempool_free(new, head->mempool);
+                        return err;
+                }
+                for (i = 0; i < fill / 2; i++) {
+                        setkey(geo, new, i, bkey(geo, node, i));
+                        setval(geo, new, i, bval(geo, node, i));
+                        setkey(geo, node, i, bkey(geo, node, i + fill / 2));
+                        setval(geo, node, i, bval(geo, node, i + fill / 2));
+                        clearpair(geo, node, i + fill / 2);
+                }
+                if (fill & 1) {
+                        setkey(geo, node, i, bkey(geo, node, fill - 1));
+                        setval(geo, node, i, bval(geo, node, fill - 1));
+                        clearpair(geo, node, fill - 1);
+                }
+                goto retry;
+        }
+        BUG_ON(fill >= geo->no_pairs);
+
+        /* shift and insert */
+        for (i = fill; i > pos; i--) {
+                setkey(geo, node, i, bkey(geo, node, i - 1));
+                setval(geo, node, i, bval(geo, node, i - 1));
+        }
+        setkey(geo, node, pos, key);
+        setval(geo, node, pos, val);
+
+        return 0;
+}
+
+int btree_insert(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key, void *val, gfp_t gfp)
+{
+        return btree_insert_level(head, geo, key, val, 1, gfp);
+}
+EXPORT_SYMBOL_GPL(btree_insert);
+
+static void *btree_remove_level(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key, int level);
+static void merge(struct btree_head *head, struct btree_geo *geo, int level,
+                unsigned long *left, int lfill,
+                unsigned long *right, int rfill,
+                unsigned long *parent, int lpos)
+{
+        int i;
+
+        for (i = 0; i < rfill; i++) {
+                /* Move all keys to the left */
+                setkey(geo, left, lfill + i, bkey(geo, right, i));
+                setval(geo, left, lfill + i, bval(geo, right, i));
+        }
+        /* Exchange left and right child in parent */
+        setval(geo, parent, lpos, right);
+        setval(geo, parent, lpos + 1, left);
+        /* Remove left (formerly right) child from parent */
+        btree_remove_level(head, geo, bkey(geo, parent, lpos), level + 1);
+        mempool_free(right, head->mempool);
+}
+
+static void rebalance(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key, int level, unsigned long *child, int fill)
+{
+        unsigned long *parent, *left = NULL, *right = NULL;
+        int i, no_left, no_right;
+
+        if (fill == 0) {
+                /* Because we don't steal entries from a neigbour, this case
+                 * can happen.  Parent node contains a single child, this
+                 * node, so merging with a sibling never happens.
+                 */
+                btree_remove_level(head, geo, key, level + 1);
+                mempool_free(child, head->mempool);
+                return;
+        }
+
+        parent = find_level(head, geo, key, level + 1);
+        i = getpos(geo, parent, key);
+        BUG_ON(bval(geo, parent, i) != child);
+
+        if (i > 0) {
+                left = bval(geo, parent, i - 1);
+                no_left = getfill(geo, left, 0);
+                if (fill + no_left <= geo->no_pairs) {
+                        merge(head, geo, level,
+                                        left, no_left,
+                                        child, fill,
+                                        parent, i - 1);
+                        return;
+                }
+        }
+        if (i + 1 < getfill(geo, parent, i)) {
+                right = bval(geo, parent, i + 1);
+                no_right = getfill(geo, right, 0);
+                if (fill + no_right <= geo->no_pairs) {
+                        merge(head, geo, level,
+                                        child, fill,
+                                        right, no_right,
+                                        parent, i);
+                        return;
+                }
+        }
+        /*
+         * We could also try to steal one entry from the left or right
+         * neighbor.  By not doing so we changed the invariant from
+         * "all nodes are at least half full" to "no two neighboring
+         * nodes can be merged".  Which means that the average fill of
+         * all nodes is still half or better.
+         */
+}
+
+static void *btree_remove_level(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key, int level)
+{
+        unsigned long *node;
+        int i, pos, fill;
+        void *ret;
+
+        if (level > head->height) {
+                /* we recursed all the way up */
+                head->height = 0;
+                head->node = NULL;
+                return NULL;
+        }
+
+        node = find_level(head, geo, key, level);
+        pos = getpos(geo, node, key);
+        fill = getfill(geo, node, pos);
+        if ((level == 1) && (keycmp(geo, node, pos, key) != 0))
+                return NULL;
+        ret = bval(geo, node, pos);
+
+        /* remove and shift */
+        for (i = pos; i < fill - 1; i++) {
+                setkey(geo, node, i, bkey(geo, node, i + 1));
+                setval(geo, node, i, bval(geo, node, i + 1));
+        }
+        clearpair(geo, node, fill - 1);
+
+        if (fill - 1 < geo->no_pairs / 2) {
+                if (level < head->height)
+                        rebalance(head, geo, key, level, node, fill - 1);
+                else if (fill - 1 == 1)
+                        btree_shrink(head, geo);
+        }
+
+        return ret;
+}
+
+void *btree_remove(struct btree_head *head, struct btree_geo *geo,
+                unsigned long *key)
+{
+        if (head->height == 0)
+                return NULL;
+
+        return btree_remove_level(head, geo, key, 1);
+}
+EXPORT_SYMBOL_GPL(btree_remove);
+
+int btree_merge(struct btree_head *target, struct btree_head *victim,
+                struct btree_geo *geo, gfp_t gfp)
+{
+        unsigned long key[geo->keylen];
+        unsigned long dup[geo->keylen];
+        void *val;
+        int err;
+
+        BUG_ON(target == victim);
+
+        if (!(target->node)) {
+                /* target is empty, just copy fields over */
+                target->node = victim->node;
+                target->height = victim->height;
+                __btree_init(victim);
+                return 0;
+        }
+
+        /* TODO: This needs some optimizations.  Currently we do three tree
+         * walks to remove a single object from the victim.
+         */
+        for (;;) {
+                if (!btree_last(victim, geo, key))
+                        break;
+                val = btree_lookup(victim, geo, key);
+                err = btree_insert(target, geo, key, val, gfp);
+                if (err)
+                        return err;
+                /* We must make a copy of the key, as the original will get
+                 * mangled inside btree_remove. */
+                longcpy(dup, key, geo->keylen);
+                btree_remove(victim, geo, dup);
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(btree_merge);
+
+static size_t __btree_for_each(struct btree_head *head, struct btree_geo *geo,
+                               unsigned long *node, unsigned long opaque,
+                               void (*func)(void *elem, unsigned long opaque,
+                                            unsigned long *key, size_t index,
+                                            void *func2),
+                               void *func2, int reap, int height, size_t count)
+{
+        int i;
+        unsigned long *child;
+
+        for (i = 0; i < geo->no_pairs; i++) {
+                child = bval(geo, node, i);
+                if (!child)
+                        break;
+                if (height > 1)
+                        count = __btree_for_each(head, geo, child, opaque,
+                                        func, func2, reap, height - 1, count);
+                else
+                        func(child, opaque, bkey(geo, node, i), count++,
+                                        func2);
+        }
+        if (reap)
+                mempool_free(node, head->mempool);
+        return count;
+}
+
+static void empty(void *elem, unsigned long opaque, unsigned long *key,
+                  size_t index, void *func2)
+{
+}
+
+void visitorl(void *elem, unsigned long opaque, unsigned long *key,
+              size_t index, void *__func)
+{
+        visitorl_t func = __func;
+
+        func(elem, opaque, *key, index);
+}
+EXPORT_SYMBOL_GPL(visitorl);
+
+void visitor32(void *elem, unsigned long opaque, unsigned long *__key,
+               size_t index, void *__func)
+{
+        visitor32_t func = __func;
+        u32 *key = (void *)__key;
+
+        func(elem, opaque, *key, index);
+}
+EXPORT_SYMBOL_GPL(visitor32);
+
+void visitor64(void *elem, unsigned long opaque, unsigned long *__key,
+               size_t index, void *__func)
+{
+        visitor64_t func = __func;
+        u64 *key = (void *)__key;
+
+        func(elem, opaque, *key, index);
+}
+EXPORT_SYMBOL_GPL(visitor64);
+
+void visitor128(void *elem, unsigned long opaque, unsigned long *__key,
+                size_t index, void *__func)
+{
+        visitor128_t func = __func;
+        u64 *key = (void *)__key;
+
+        func(elem, opaque, key[0], key[1], index);
+}
+EXPORT_SYMBOL_GPL(visitor128);
+
+size_t btree_visitor(struct btree_head *head, struct btree_geo *geo,
+                     unsigned long opaque,
+                     void (*func)(void *elem, unsigned long opaque,
+                                  unsigned long *key,
+                                  size_t index, void *func2),
+                     void *func2)
+{
+        size_t count = 0;
+
+        if (!func2)
+                func = empty;
+        if (head->node)
+                count = __btree_for_each(head, geo, head->node, opaque, func,
+                                func2, 0, head->height, 0);
+        return count;
+}
+EXPORT_SYMBOL_GPL(btree_visitor);
+
+size_t btree_grim_visitor(struct btree_head *head, struct btree_geo *geo,
+                          unsigned long opaque,
+                          void (*func)(void *elem, unsigned long opaque,
+                                       unsigned long *key,
+                                       size_t index, void *func2),
+                          void *func2)
+{
+        size_t count = 0;
+
+        if (!func2)
+                func = empty;
+        if (head->node)
+                count = __btree_for_each(head, geo, head->node, opaque, func,
+                                func2, 1, head->height, 0);
+        __btree_init(head);
+        return count;
+}
+EXPORT_SYMBOL_GPL(btree_grim_visitor);
+
+static int __init btree_module_init(void)
+{
+        btree_cachep = kmem_cache_create("btree_node", NODESIZE, 0,
+                        SLAB_HWCACHE_ALIGN, NULL);
+        return 0;
+}
+
+static void __exit btree_module_exit(void)
+{
+        kmem_cache_destroy(btree_cachep);
+}
+
+/* If core code starts using btree, initialization should happen even earlier */
+module_init(btree_module_init);
+module_exit(btree_module_exit);
+
+MODULE_AUTHOR("Joern Engel <joern@logfs.org>");
+MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
+MODULE_LICENSE("GPL");
diff --git a/lib/crc32.c b/lib/crc32.c
index 02e3b31b3a79..0f45fbff34cb 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -30,11 +30,15 @@
 #include <asm/atomic.h>
 #include "crc32defs.h"
 #if CRC_LE_BITS == 8
-#define tole(x) __constant_cpu_to_le32(x)
-#define tobe(x) __constant_cpu_to_be32(x)
+# define tole(x) __constant_cpu_to_le32(x)
 #else
-#define tole(x) (x)
-#define tobe(x) (x)
+# define tole(x) (x)
+#endif
+
+#if CRC_BE_BITS == 8
+# define tobe(x) __constant_cpu_to_be32(x)
+#else
+# define tobe(x) (x)
 #endif
 #include "crc32table.h"
 
@@ -52,20 +56,19 @@ crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 *tab)
 # else
 #  define DO_CRC(x) crc = tab[((crc >> 24) ^ (x)) & 255] ^ (crc << 8)
 # endif
-        const u32 *b = (const u32 *)buf;
+        const u32 *b;
         size_t    rem_len;
 
         /* Align it */
-        if (unlikely((long)b & 3 && len)) {
-                u8 *p = (u8 *)b;
+        if (unlikely((long)buf & 3 && len)) {
                 do {
-                        DO_CRC(*p++);
-                } while ((--len) && ((long)p)&3);
-                b = (u32 *)p;
+                        DO_CRC(*buf++);
+                } while ((--len) && ((long)buf)&3);
         }
         rem_len = len & 3;
         /* load data 32 bits wide, xor data 32 bits wide. */
         len = len >> 2;
+        b = (const u32 *)buf;
         for (--b; len; --len) {
                 crc ^= *++b; /* use pre increment for speed */
                 DO_CRC(0);
@@ -82,6 +85,7 @@ crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 *tab)
                 } while (--len);
         }
         return crc;
+#undef DO_CRC
 }
 #endif
 /**
@@ -119,9 +123,6 @@ u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
         crc = __cpu_to_le32(crc);
         crc = crc32_body(crc, p, len, tab);
         return __le32_to_cpu(crc);
-#undef ENDIAN_SHIFT
-#undef DO_CRC
-
 # elif CRC_LE_BITS == 4
         while (len--) {
                 crc ^= *p++;
@@ -179,9 +180,6 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
         crc = __cpu_to_be32(crc);
         crc = crc32_body(crc, p, len, tab);
         return __be32_to_cpu(crc);
-#undef ENDIAN_SHIFT
-#undef DO_CRC
-
 # elif CRC_BE_BITS == 4
         while (len--) {
                 crc ^= *p++ << 24;
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 19d11e0bb958..4b5cb794c38b 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -4,99 +4,214 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 
+#define MAX_LIST_LENGTH_BITS 20
+
+/*
+ * Returns a list organized in an intermediate format suited
+ * to chaining of merge() calls: null-terminated, no reserved or
+ * sentinel head node, "prev" links not maintained.
+ */
+static struct list_head *merge(void *priv,
+                                int (*cmp)(void *priv, struct list_head *a,
+                                        struct list_head *b),
+                                struct list_head *a, struct list_head *b)
+{
+        struct list_head head, *tail = &head;
+
+        while (a && b) {
+                /* if equal, take 'a' -- important for sort stability */
+                if ((*cmp)(priv, a, b) <= 0) {
+                        tail->next = a;
+                        a = a->next;
+                } else {
+                        tail->next = b;
+                        b = b->next;
+                }
+                tail = tail->next;
+        }
+        tail->next = a?:b;
+        return head.next;
+}
+
+/*
+ * Combine final list merge with restoration of standard doubly-linked
+ * list structure.  This approach duplicates code from merge(), but
+ * runs faster than the tidier alternatives of either a separate final
+ * prev-link restoration pass, or maintaining the prev links
+ * throughout.
+ */
+static void merge_and_restore_back_links(void *priv,
+                                int (*cmp)(void *priv, struct list_head *a,
+                                        struct list_head *b),
+                                struct list_head *head,
+                                struct list_head *a, struct list_head *b)
+{
+        struct list_head *tail = head;
+
+        while (a && b) {
+                /* if equal, take 'a' -- important for sort stability */
+                if ((*cmp)(priv, a, b) <= 0) {
+                        tail->next = a;
+                        a->prev = tail;
+                        a = a->next;
+                } else {
+                        tail->next = b;
+                        b->prev = tail;
+                        b = b->next;
+                }
+                tail = tail->next;
+        }
+        tail->next = a ? : b;
+
+        do {
+                /*
+                 * In worst cases this loop may run many iterations.
+                 * Continue callbacks to the client even though no
+                 * element comparison is needed, so the client's cmp()
+                 * routine can invoke cond_resched() periodically.
+                 */
+                (*cmp)(priv, tail, tail);
+
+                tail->next->prev = tail;
+                tail = tail->next;
+        } while (tail->next);
+
+        tail->next = head;
+        head->prev = tail;
+}
+
 /**
- * list_sort - sort a list.
- * @priv: private data, passed to @cmp
+ * list_sort - sort a list
+ * @priv: private data, opaque to list_sort(), passed to @cmp
  * @head: the list to sort
  * @cmp: the elements comparison function
  *
- * This function has been implemented by Mark J Roberts <mjr@znex.org>. It
- * implements "merge sort" which has O(nlog(n)) complexity. The list is sorted
- * in ascending order.
+ * This function implements "merge sort", which has O(nlog(n))
+ * complexity.
  *
- * The comparison function @cmp is supposed to return a negative value if @a is
- * less than @b, and a positive value if @a is greater than @b. If @a and @b
- * are equivalent, then it does not matter what this function returns.
+ * The comparison function @cmp must return a negative value if @a
+ * should sort before @b, and a positive value if @a should sort after
+ * @b. If @a and @b are equivalent, and their original relative
+ * ordering is to be preserved, @cmp must return 0.
  */
 void list_sort(void *priv, struct list_head *head,
-               int (*cmp)(void *priv, struct list_head *a,
-                          struct list_head *b))
+                int (*cmp)(void *priv, struct list_head *a,
+                        struct list_head *b))
 {
-        struct list_head *p, *q, *e, *list, *tail, *oldhead;
-        int insize, nmerges, psize, qsize, i;
+        struct list_head *part[MAX_LIST_LENGTH_BITS+1]; /* sorted partial lists
+                                                -- last slot is a sentinel */
+        int lev;  /* index into part[] */
+        int max_lev = 0;
+        struct list_head *list;
 
         if (list_empty(head))
                 return;
 
+        memset(part, 0, sizeof(part));
+
+        head->prev->next = NULL;
         list = head->next;
-        list_del(head);
-        insize = 1;
-        for (;;) {
-                p = oldhead = list;
-                list = tail = NULL;
-                nmerges = 0;
-
-                while (p) {
-                        nmerges++;
-                        q = p;
-                        psize = 0;
-                        for (i = 0; i < insize; i++) {
-                                psize++;
-                                q = q->next == oldhead ? NULL : q->next;
-                                if (!q)
-                                        break;
-                        }
 
-                        qsize = insize;
-                        while (psize > 0 || (qsize > 0 && q)) {
-                                if (!psize) {
-                                        e = q;
-                                        q = q->next;
-                                        qsize--;
-                                        if (q == oldhead)
-                                                q = NULL;
-                                } else if (!qsize || !q) {
-                                        e = p;
-                                        p = p->next;
-                                        psize--;
-                                        if (p == oldhead)
-                                                p = NULL;
-                                } else if (cmp(priv, p, q) <= 0) {
-                                        e = p;
-                                        p = p->next;
-                                        psize--;
-                                        if (p == oldhead)
-                                                p = NULL;
-                                } else {
-                                        e = q;
-                                        q = q->next;
-                                        qsize--;
-                                        if (q == oldhead)
-                                                q = NULL;
-                                }
-                                if (tail)
-                                        tail->next = e;
-                                else
-                                        list = e;
-                                e->prev = tail;
-                                tail = e;
+        while (list) {
+                struct list_head *cur = list;
+                list = list->next;
+                cur->next = NULL;
+
+                for (lev = 0; part[lev]; lev++) {
+                        cur = merge(priv, cmp, part[lev], cur);
+                        part[lev] = NULL;
+                }
+                if (lev > max_lev) {
+                        if (unlikely(lev >= ARRAY_SIZE(part)-1)) {
+                                printk_once(KERN_DEBUG "list passed to"
+                                        " list_sort() too long for"
+                                        " efficiency\n");
+                                lev--;
                         }
-                        p = q;
+                        max_lev = lev;
                 }
+                part[lev] = cur;
+        }
 
-                tail->next = list;
-                list->prev = tail;
+        for (lev = 0; lev < max_lev; lev++)
+                if (part[lev])
+                        list = merge(priv, cmp, part[lev], list);
 
-                if (nmerges <= 1)
-                        break;
+        merge_and_restore_back_links(priv, cmp, head, part[max_lev], list);
+}
+EXPORT_SYMBOL(list_sort);
 
-                insize *= 2;
-        }
+#ifdef DEBUG_LIST_SORT
+struct debug_el {
+        struct list_head l_h;
+        int value;
+        unsigned serial;
+};
 
-        head->next = list;
-        head->prev = list->prev;
-        list->prev->next = head;
-        list->prev = head;
+static int cmp(void *priv, struct list_head *a, struct list_head *b)
+{
+        return container_of(a, struct debug_el, l_h)->value
+             - container_of(b, struct debug_el, l_h)->value;
 }
 
-EXPORT_SYMBOL(list_sort);
+/*
+ * The pattern of set bits in the list length determines which cases
+ * are hit in list_sort().
+ */
+#define LIST_SORT_TEST_LENGTH (512+128+2) /* not including head */
+
+static int __init list_sort_test(void)
+{
+        int i, r = 1, count;
+        struct list_head *head = kmalloc(sizeof(*head), GFP_KERNEL);
+        struct list_head *cur;
+
+        printk(KERN_WARNING "testing list_sort()\n");
+
+        cur = head;
+        for (i = 0; i < LIST_SORT_TEST_LENGTH; i++) {
+                struct debug_el *el = kmalloc(sizeof(*el), GFP_KERNEL);
+                BUG_ON(!el);
+                 /* force some equivalencies */
+                el->value = (r = (r * 725861) % 6599) % (LIST_SORT_TEST_LENGTH/3);
+                el->serial = i;
+
+                el->l_h.prev = cur;
+                cur->next = &el->l_h;
+                cur = cur->next;
+        }
+        head->prev = cur;
+
+        list_sort(NULL, head, cmp);
+
+        count = 1;
+        for (cur = head->next; cur->next != head; cur = cur->next) {
+                struct debug_el *el = container_of(cur, struct debug_el, l_h);
+                int cmp_result = cmp(NULL, cur, cur->next);
+                if (cur->next->prev != cur) {
+                        printk(KERN_EMERG "list_sort() returned "
+                                                "a corrupted list!\n");
+                        return 1;
+                } else if (cmp_result > 0) {
+                        printk(KERN_EMERG "list_sort() failed to sort!\n");
+                        return 1;
+                } else if (cmp_result == 0 &&
+                                el->serial >= container_of(cur->next,
+                                        struct debug_el, l_h)->serial) {
+                        printk(KERN_EMERG "list_sort() failed to preserve order"
+                                                 " of equivalent elements!\n");
+                        return 1;
+                }
+                kfree(cur->prev);
+                count++;
+        }
+        kfree(cur);
+        if (count != LIST_SORT_TEST_LENGTH) {
+                printk(KERN_EMERG "list_sort() returned list of"
+                                                "different length!\n");
+                return 1;
+        }
+        return 0;
+}
+module_init(list_sort_test);
+#endif
diff --git a/lib/show_mem.c b/lib/show_mem.c
index 238e72a18ce1..fdc77c82f922 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -15,7 +15,7 @@ void show_mem(void)
         unsigned long total = 0, reserved = 0, shared = 0,
                 nonshared = 0, highmem = 0;
 
-        printk(KERN_INFO "Mem-Info:\n");
+        printk("Mem-Info:\n");
         show_free_areas();
 
         for_each_online_pgdat(pgdat) {
@@ -49,15 +49,15 @@ void show_mem(void)
                 pgdat_resize_unlock(pgdat, &flags);
         }
 
-        printk(KERN_INFO "%lu pages RAM\n", total);
+        printk("%lu pages RAM\n", total);
 #ifdef CONFIG_HIGHMEM
-        printk(KERN_INFO "%lu pages HighMem\n", highmem);
+        printk("%lu pages HighMem\n", highmem);
 #endif
-        printk(KERN_INFO "%lu pages reserved\n", reserved);
-        printk(KERN_INFO "%lu pages shared\n", shared);
-        printk(KERN_INFO "%lu pages non-shared\n", nonshared);
+        printk("%lu pages reserved\n", reserved);
+        printk("%lu pages shared\n", shared);
+        printk("%lu pages non-shared\n", nonshared);
 #ifdef CONFIG_QUICKLIST
-        printk(KERN_INFO "%lu pages in pagetable cache\n",
+        printk("%lu pages in pagetable cache\n",
                 quicklist_total_size());
 #endif
 }
diff --git a/lib/string.c b/lib/string.c
index a1cdcfcc42d0..f71bead1be3e 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -36,25 +36,21 @@ int strnicmp(const char *s1, const char *s2, size_t len)
         /* Yes, Virginia, it had better be unsigned */
         unsigned char c1, c2;
 
-        c1 = c2 = 0;
-        if (len) {
-                do {
-                        c1 = *s1;
-                        c2 = *s2;
-                        s1++;
-                        s2++;
-                        if (!c1)
-                                break;
-                        if (!c2)
-                                break;
-                        if (c1 == c2)
-                                continue;
-                        c1 = tolower(c1);
-                        c2 = tolower(c2);
-                        if (c1 != c2)
-                                break;
-                } while (--len);
-        }
+        if (!len)
+                return 0;
+
+        do {
+                c1 = *s1++;
+                c2 = *s2++;
+                if (!c1 || !c2)
+                        break;
+                if (c1 == c2)
+                        continue;
+                c1 = tolower(c1);
+                c2 = tolower(c2);
+                if (c1 != c2)
+                        break;
+        } while (--len);
         return (int)c1 - (int)c2;
 }
 EXPORT_SYMBOL(strnicmp);
@@ -693,13 +689,13 @@ EXPORT_SYMBOL(strstr);
  */
 char *strnstr(const char *s1, const char *s2, size_t len)
 {
-        size_t l1 = len, l2;
+        size_t l2;
 
         l2 = strlen(s2);
         if (!l2)
                 return (char *)s1;
-        while (l1 >= l2) {
-                l1--;
+        while (len >= l2) {
+                len--;
                 if (!memcmp(s1, s2, l2))
                         return (char *)s1;
                 s1++;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index af4aaa6c36f3..0d461c7c14db 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -381,8 +381,8 @@ static noinline char *put_dec(char *buf, unsigned long long num)
 #define PLUS    4               /* show plus */
 #define SPACE   8               /* space if plus */
 #define LEFT    16              /* left justified */
-#define SMALL   32              /* Must be 32 == 0x20 */
-#define SPECIAL 64              /* 0x */
+#define SMALL   32              /* use lowercase in hex (must be 32 == 0x20) */
+#define SPECIAL 64              /* prefix hex with "0x", octal with "0" */
 
 enum format_type {
         FORMAT_TYPE_NONE, /* Just a string part */
@@ -408,12 +408,12 @@ enum format_type {
 };
 
 struct printf_spec {
-        enum format_type        type;
-        int                     flags;          /* flags to number() */
-        int                     field_width;    /* width of output field */
-        int                     base;
-        int                     precision;      /* # of digits/chars */
-        int                     qualifier;
+        u16     type;
+        s16     field_width;    /* width of output field */
+        u8      flags;          /* flags to number() */
+        u8      base;
+        s8      precision;      /* # of digits/chars */
+        u8      qualifier;
 };
 
 static char *number(char *buf, char *end, unsigned long long num,
@@ -597,22 +597,29 @@ static char *resource_string(char *buf, char *end, struct resource *res,
 #ifndef MEM_RSRC_PRINTK_SIZE
 #define MEM_RSRC_PRINTK_SIZE    10
 #endif
-        struct printf_spec hex_spec = {
+        static const struct printf_spec io_spec = {
                 .base = 16,
+                .field_width = IO_RSRC_PRINTK_SIZE,
                 .precision = -1,
                 .flags = SPECIAL | SMALL | ZEROPAD,
         };
-        struct printf_spec dec_spec = {
+        static const struct printf_spec mem_spec = {
+                .base = 16,
+                .field_width = MEM_RSRC_PRINTK_SIZE,
+                .precision = -1,
+                .flags = SPECIAL | SMALL | ZEROPAD,
+        };
+        static const struct printf_spec dec_spec = {
                 .base = 10,
                 .precision = -1,
                 .flags = 0,
         };
-        struct printf_spec str_spec = {
+        static const struct printf_spec str_spec = {
                 .field_width = -1,
                 .precision = 10,
                 .flags = LEFT,
         };
-        struct printf_spec flag_spec = {
+        static const struct printf_spec flag_spec = {
                 .base = 16,
                 .precision = -1,
                 .flags = SPECIAL | SMALL,
@@ -628,35 +635,31 @@ static char *resource_string(char *buf, char *end, struct resource *res,
                      2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)];
 
         char *p = sym, *pend = sym + sizeof(sym);
-        int size = -1, addr = 0;
         int decode = (fmt[0] == 'R') ? 1 : 0;
-
-        if (res->flags & IORESOURCE_IO) {
-                size = IO_RSRC_PRINTK_SIZE;
-                addr = 1;
-        } else if (res->flags & IORESOURCE_MEM) {
-                size = MEM_RSRC_PRINTK_SIZE;
-                addr = 1;
-        }
+        const struct printf_spec *specp;
 
         *p++ = '[';
-        if (res->flags & IORESOURCE_IO)
+        if (res->flags & IORESOURCE_IO) {
                 p = string(p, pend, "io  ", str_spec);
-        else if (res->flags & IORESOURCE_MEM)
+                specp = &io_spec;
+        } else if (res->flags & IORESOURCE_MEM) {
                 p = string(p, pend, "mem ", str_spec);
-        else if (res->flags & IORESOURCE_IRQ)
+                specp = &mem_spec;
+        } else if (res->flags & IORESOURCE_IRQ) {
                 p = string(p, pend, "irq ", str_spec);
-        else if (res->flags & IORESOURCE_DMA)
+                specp = &dec_spec;
+        } else if (res->flags & IORESOURCE_DMA) {
                 p = string(p, pend, "dma ", str_spec);
-        else {
+                specp = &dec_spec;
+        } else {
                 p = string(p, pend, "??? ", str_spec);
+                specp = &mem_spec;
                 decode = 0;
         }
-        hex_spec.field_width = size;
-        p = number(p, pend, res->start, addr ? hex_spec : dec_spec);
+        p = number(p, pend, res->start, *specp);
         if (res->start != res->end) {
                 *p++ = '-';
-                p = number(p, pend, res->end, addr ? hex_spec : dec_spec);
+                p = number(p, pend, res->end, *specp);
         }
         if (decode) {
                 if (res->flags & IORESOURCE_MEM_64)
@@ -1333,7 +1336,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                         break;
 
                 case FORMAT_TYPE_NRCHARS: {
-                        int qualifier = spec.qualifier;
+                        u8 qualifier = spec.qualifier;
 
                         if (qualifier == 'l') {
                                 long *ip = va_arg(args, long *);
@@ -1619,7 +1622,7 @@ do {									\
 
                 case FORMAT_TYPE_NRCHARS: {
                         /* skip %n 's argument */
-                        int qualifier = spec.qualifier;
+                        u8 qualifier = spec.qualifier;
                         void *skip_arg;
                         if (qualifier == 'l')
                                 skip_arg = va_arg(args, long *);
@@ -1885,7 +1888,9 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
         char *next;
         char digit;
         int num = 0;
-        int qualifier, base, field_width;
+        u8 qualifier;
+        u8 base;
+        s16 field_width;
         bool is_sign;
 
         while (*fmt && *str) {
@@ -1963,7 +1968,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 {
                         char *s = (char *)va_arg(args, char *);
                         if (field_width == -1)
-                                field_width = INT_MAX;
+                                field_width = SHORT_MAX;
                         /* first, skip leading white space in buffer */
                         str = skip_spaces(str);