diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /lib/prio_heap.c | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'lib/prio_heap.c')
| -rw-r--r-- | lib/prio_heap.c | 2 |
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) | |||
| 31 | 31 | ||
| 32 | if (heap->size < heap->max) { | 32 | if (heap->size < heap->max) { |
| 33 | /* Heap insertion */ | 33 | /* Heap insertion */ |
| 34 | int pos = heap->size++; | 34 | pos = heap->size++; |
| 35 | while (pos > 0 && heap->gt(p, ptrs[(pos-1)/2])) { | 35 | while (pos > 0 && heap->gt(p, ptrs[(pos-1)/2])) { |
| 36 | ptrs[pos] = ptrs[(pos-1)/2]; | 36 | ptrs[pos] = ptrs[(pos-1)/2]; |
| 37 | pos = (pos-1)/2; | 37 | pos = (pos-1)/2; |