Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[pandora-kernel.git] / lib / sort.c

diff --git a/lib/sort.c b/lib/sort.c
index ea3caed..5f3b51f 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;
 
@@ -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);