Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / lib / sort.c

diff --git a/lib/sort.c b/lib/sort.c
index ea3caedeabdb67f2ebe5199daa1086d7fbac0882..961567894d16b89a208244ea957e44a3d9afd668 100644 (file)
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -6,15 +6,17 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/sort.h>
+#include <linux/slab.h>
 
-void u32_swap(void *a, void *b, int size)
+static void u32_swap(void *a, void *b, int size)
 {
        u32 t = *(u32 *)a;
        *(u32 *)a = *(u32 *)b;
        *(u32 *)b = t;
 }
 
-void generic_swap(void *a, void *b, int size)
+static void generic_swap(void *a, void *b, int size)
 {
        char t;
 
@@ -25,7 +27,7 @@ void generic_swap(void *a, void *b, int size)
        } while (--size > 0);
 }
 
-/*
+/**
  * sort - sort an array of elements
  * @base: pointer to data to sort
  * @num: number of elements
@@ -47,15 +49,15 @@ void sort(void *base, size_t num, size_t size,
          void (*swap)(void *, void *, int size))
 {
        /* pre-scale counters for performance */
-       int i = (num/2) * size, n = num * size, c, r;
+       int i = (num/2 - 1) * size, n = num * size, c, r;
 
        if (!swap)
                swap = (size == 4 ? u32_swap : generic_swap);
 
        /* heapify */
        for ( ; i >= 0; i -= size) {
-               for (r = i; r * 2 < n; r  = c) {
-                       c = r * 2;
+               for (r = i; r * 2 + size < n; r  = c) {
+                       c = r * 2 + size;
                        if (c < n - size && cmp(base + c, base + c + size) < 0)
                                c += size;
                        if (cmp(base + r, base + c) >= 0)
@@ -67,8 +69,8 @@ void sort(void *base, size_t num, size_t size,
        /* sort */
        for (i = n - size; i >= 0; i -= size) {
                swap(base, base + i, size);
-               for (r = 0; r * 2 < i; r = c) {
-                       c = r * 2;
+               for (r = 0; r * 2 + size < i; r = c) {
+                       c = r * 2 + size;
                        if (c < i - size && cmp(base + c, base + c + size) < 0)
                                c += size;
                        if (cmp(base + r, base + c) >= 0)
@@ -90,7 +92,7 @@ int cmpint(const void *a, const void *b)
 
 static int sort_test(void)
 {
-       int *a, i, r = 0;
+       int *a, i, r = 1;
 
        a = kmalloc(1000 * sizeof(int), GFP_KERNEL);
        BUG_ON(!a);