Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

2 files changed, 48 insertions, 2 deletions

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 3389e2440da0..1f71b97de0f9 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -109,10 +109,10 @@ bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)
 #endif
         /* FIXME: Bandaid to save us from old primitives which go to NR_CPUS. */
         if (*mask) {
+                unsigned char *ptr = (unsigned char *)cpumask_bits(*mask);
                 unsigned int tail;
                 tail = BITS_TO_LONGS(NR_CPUS - nr_cpumask_bits) * sizeof(long);
-                memset(cpumask_bits(*mask) + cpumask_size() - tail,
-                       0, tail);
+                memset(ptr + cpumask_size() - tail, 0, tail);
         }
 
         return *mask != NULL;
diff --git a/lib/idr.c b/lib/idr.c
index dab4bca86f5d..80ca9aca038b 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -579,6 +579,52 @@ int idr_for_each(struct idr *idp,
 EXPORT_SYMBOL(idr_for_each);
 
 /**
+ * idr_get_next - lookup next object of id to given id.
+ * @idp: idr handle
+ * @id:  pointer to lookup key
+ *
+ * Returns pointer to registered object with id, which is next number to
+ * given id.
+ */
+
+void *idr_get_next(struct idr *idp, int *nextidp)
+{
+        struct idr_layer *p, *pa[MAX_LEVEL];
+        struct idr_layer **paa = &pa[0];
+        int id = *nextidp;
+        int n, max;
+
+        /* find first ent */
+        n = idp->layers * IDR_BITS;
+        max = 1 << n;
+        p = rcu_dereference(idp->top);
+        if (!p)
+                return NULL;
+
+        while (id < max) {
+                while (n > 0 && p) {
+                        n -= IDR_BITS;
+                        *paa++ = p;
+                        p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);
+                }
+
+                if (p) {
+                        *nextidp = id;
+                        return p;
+                }
+
+                id += 1 << n;
+                while (n < fls(id)) {
+                        n += IDR_BITS;
+                        p = *--paa;
+                }
+        }
+        return NULL;
+}
+
+
+
+/**
  * idr_replace - replace pointer for given id
  * @idp: idr handle
  * @ptr: pointer you want associated with the id