Merge branch 'linus' into x86/setup-lzma

Conflicts:
	init/do_mounts_rd.c

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/prio_heap.c b/lib/prio_heap.c
index 471944a54e23..a7af6f85eca8 100644
--- a/lib/prio_heap.c
+++ b/lib/prio_heap.c
@@ -31,7 +31,7 @@ void *heap_insert(struct ptr_heap *heap, void *p)
 
         if (heap->size < heap->max) {
                 /* Heap insertion */
-                int pos = heap->size++;
+                pos = heap->size++;
                 while (pos > 0 && heap->gt(p, ptrs[(pos-1)/2])) {
                         ptrs[pos] = ptrs[(pos-1)/2];
                         pos = (pos-1)/2;