6 files changed, 81 insertions, 8 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7d16e6433302..c567f219191d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -498,3 +498,5 @@ config FAULT_INJECTION_STACKTRACE_FILTER
         select FRAME_POINTER
         help
           Provide stacktrace filter for fault-injection capabilities
+
+source "samples/Kconfig"
diff --git a/lib/Makefile b/lib/Makefile
index c5f215d509d3..3a0983b77412 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
          rbtree.o radix-tree.o dump_stack.o \
          idr.o int_sqrt.o bitmap.o extable.o prio_tree.o \
          sha1.o irq_regs.o reciprocal_div.o argv_split.o \
-         proportions.o
+         proportions.o prio_heap.o
 
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
diff --git a/lib/hweight.c b/lib/hweight.c
index 360556a7803d..389424ecb129 100644
--- a/lib/hweight.c
+++ b/lib/hweight.c
@@ -1,6 +1,6 @@
 #include <linux/module.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
-#include <asm/bitops.h>
 
 /**
  * hweightN - returns the hamming weight of a N-bit word
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 9659eabffc31..393a0e915c23 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -124,12 +124,13 @@ static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb,
         mutex_lock(&percpu_counters_lock);
         list_for_each_entry(fbc, &percpu_counters, list) {
                 s32 *pcount;
+                unsigned long flags;
 
-                spin_lock(&fbc->lock);
+                spin_lock_irqsave(&fbc->lock, flags);
                 pcount = per_cpu_ptr(fbc->counters, cpu);
                 fbc->count += *pcount;
                 *pcount = 0;
-                spin_unlock(&fbc->lock);
+                spin_unlock_irqrestore(&fbc->lock, flags);
         }
         mutex_unlock(&percpu_counters_lock);
         return NOTIFY_OK;
diff --git a/lib/prio_heap.c b/lib/prio_heap.c
new file mode 100644
index 000000000000..471944a54e23
--- /dev/null
+++ b/lib/prio_heap.c
@@ -0,0 +1,70 @@
+/*
+ * Simple insertion-only static-sized priority heap containing
+ * pointers, based on CLR, chapter 7
+ */
+
+#include <linux/slab.h>
+#include <linux/prio_heap.h>
+
+int heap_init(struct ptr_heap *heap, size_t size, gfp_t gfp_mask,
+              int (*gt)(void *, void *))
+{
+        heap->ptrs = kmalloc(size, gfp_mask);
+        if (!heap->ptrs)
+                return -ENOMEM;
+        heap->size = 0;
+        heap->max = size / sizeof(void *);
+        heap->gt = gt;
+        return 0;
+}
+
+void heap_free(struct ptr_heap *heap)
+{
+        kfree(heap->ptrs);
+}
+
+void *heap_insert(struct ptr_heap *heap, void *p)
+{
+        void *res;
+        void **ptrs = heap->ptrs;
+        int pos;
+
+        if (heap->size < heap->max) {
+                /* Heap insertion */
+                int pos = heap->size++;
+                while (pos > 0 && heap->gt(p, ptrs[(pos-1)/2])) {
+                        ptrs[pos] = ptrs[(pos-1)/2];
+                        pos = (pos-1)/2;
+                }
+                ptrs[pos] = p;
+                return NULL;
+        }
+
+        /* The heap is full, so something will have to be dropped */
+
+        /* If the new pointer is greater than the current max, drop it */
+        if (heap->gt(p, ptrs[0]))
+                return p;
+
+        /* Replace the current max and heapify */
+        res = ptrs[0];
+        ptrs[0] = p;
+        pos = 0;
+
+        while (1) {
+                int left = 2 * pos + 1;
+                int right = 2 * pos + 2;
+                int largest = pos;
+                if (left < heap->size && heap->gt(ptrs[left], p))
+                        largest = left;
+                if (right < heap->size && heap->gt(ptrs[right], ptrs[largest]))
+                        largest = right;
+                if (largest == pos)
+                        break;
+                /* Push p down the heap one level and bump one up */
+                ptrs[pos] = ptrs[largest];
+                ptrs[largest] = p;
+                pos = largest;
+        }
+        return res;
+}
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 479fd462eaa9..9c4b0256490b 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -60,12 +60,12 @@ static void spin_bug(spinlock_t *lock, const char *msg)
                 owner = lock->owner;
         printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
                 msg, raw_smp_processor_id(),
-                current->comm, current->pid);
+                current->comm, task_pid_nr(current));
         printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
                         ".owner_cpu: %d\n",
                 lock, lock->magic,
                 owner ? owner->comm : "<none>",
-                owner ? owner->pid : -1,
+                owner ? task_pid_nr(owner) : -1,
                 lock->owner_cpu);
         dump_stack();
 }
@@ -116,7 +116,7 @@ static void __spin_lock_debug(spinlock_t *lock)
                         printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
                                         "%s/%d, %p\n",
                                 raw_smp_processor_id(), current->comm,
-                                current->pid, lock);
+                                task_pid_nr(current), lock);
                         dump_stack();
 #ifdef CONFIG_SMP
                         trigger_all_cpu_backtrace();
@@ -161,7 +161,7 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)
 
         printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
                 msg, raw_smp_processor_id(), current->comm,
-                current->pid, lock);
+                task_pid_nr(current), lock);
         dump_stack();
 }