diff --git a/[refs] b/[refs]
index eed7590d3664..d857d1b5605b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 207f36eec9e7b1077d7a0aaadb4800e2c9b4cfa4
+refs/heads/master: ecec4cb7a9df5f61fe00710d2f2c69ce9a3b1d40
diff --git a/trunk/lib/sort.c b/trunk/lib/sort.c
index b73dbb0e7c83..ddc4d35df289 100644
--- a/trunk/lib/sort.c
+++ b/trunk/lib/sort.c
@@ -6,15 +6,16 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/sort.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;