Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

2011-01-10 10:40:42 +11:00
parent d2e7ad1922 350e4f31e0
commit aeda4ac3ef
11 changed files with 948 additions and 935 deletions
@@ -71,7 +71,7 @@ void *flex_array_get(struct flex_array *fa, unsigned int element_nr);
 int flex_array_shrink(struct flex_array *fa);

 #define flex_array_put_ptr(fa, nr, src, gfp) \
-	flex_array_put(fa, nr, &(void *)(src), gfp)
+	flex_array_put(fa, nr, (void *)&(src), gfp)

 void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr);