diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 14:20:52 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 14:20:52 +1100 |
| commit | 040ef3fcf0625a1b90df72cefeb57746c02c2f75 (patch) | |
| tree | e85b2c6acb8f31edd6a316ffd1e14a575aca6779 /include | |
| parent | 4d6218bd9e8a3d0a10fe5921782ab40af0a6bfd7 (diff) | |
| parent | 73ff5fc0a86b28b77e02a6963b388d1dbfa0a263 (diff) | |
Merge remote branch 'selinux/master'
Diffstat (limited to 'include')
| -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); |