diff options
| author | James Morris <jmorris@namei.org> | 2011-01-09 18:40:42 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-01-09 18:40:42 -0500 |
| commit | aeda4ac3efc29e4d55989abd0a73530453aa69ba (patch) | |
| tree | 35b3d2cca8bfb49cf08bf1c6b55b586c1e5971e7 /include/linux/flex_array.h | |
| parent | d2e7ad19229f982fc1eb731827d82ceac90abfb3 (diff) | |
| parent | 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Diffstat (limited to 'include/linux/flex_array.h')
| -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); | |||
| 71 | int flex_array_shrink(struct flex_array *fa); | 71 | int flex_array_shrink(struct flex_array *fa); |
| 72 | 72 | ||
| 73 | #define flex_array_put_ptr(fa, nr, src, gfp) \ | 73 | #define flex_array_put_ptr(fa, nr, src, gfp) \ |
| 74 | flex_array_put(fa, nr, &(void *)(src), gfp) | 74 | flex_array_put(fa, nr, (void *)&(src), gfp) |
| 75 | 75 | ||
| 76 | void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr); | 76 | void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr); |
| 77 | 77 | ||