diff options
| author | James Morris | 2011-01-10 00:40:42 +0100 |
|---|---|---|
| committer | James Morris | 2011-01-10 00:40:42 +0100 |
| commit | aeda4ac3efc29e4d55989abd0a73530453aa69ba (patch) | |
| tree | 35b3d2cca8bfb49cf08bf1c6b55b586c1e5971e7 /include/linux | |
| parent | Merge branch 'master' into next (diff) | |
| parent | SELinux: define permissions for DCB netlink messages (diff) | |
| download | kernel-qcow2-linux-aeda4ac3efc29e4d55989abd0a73530453aa69ba.tar.gz kernel-qcow2-linux-aeda4ac3efc29e4d55989abd0a73530453aa69ba.tar.xz kernel-qcow2-linux-aeda4ac3efc29e4d55989abd0a73530453aa69ba.zip | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/flex_array.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/flex_array.h b/include/linux/flex_array.h index 631b77f2ac70..70e4efabe0fb 100644 --- a/include/linux/flex_array.h +++ b/include/linux/flex_array.h @@ -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); |