aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-05-04 11:59:34 +1000
committerJames Morris <jmorris@namei.org>2011-05-04 11:59:34 +1000
commit6f239284542bae297d27355d06afbb8df23c5db9 (patch)
treeb0ba42fb54cd05178c61584e0913be38a57f0384 /include
parent609cfda586c7fe3e5d1a02c51edb587506294167 (diff)
parentbf69d41d198138e3c601e9a6645f4f1369aff7e0 (diff)
downloadkernel_samsung_espresso10-6f239284542bae297d27355d06afbb8df23c5db9.zip
kernel_samsung_espresso10-6f239284542bae297d27355d06afbb8df23c5db9.tar.gz
kernel_samsung_espresso10-6f239284542bae297d27355d06afbb8df23c5db9.tar.bz2
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/flex_array.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/flex_array.h b/include/linux/flex_array.h
index 70e4efa..ebeb2f3 100644
--- a/include/linux/flex_array.h
+++ b/include/linux/flex_array.h
@@ -61,7 +61,7 @@ struct flex_array {
struct flex_array *flex_array_alloc(int element_size, unsigned int total,
gfp_t flags);
int flex_array_prealloc(struct flex_array *fa, unsigned int start,
- unsigned int end, gfp_t flags);
+ unsigned int nr_elements, gfp_t flags);
void flex_array_free(struct flex_array *fa);
void flex_array_free_parts(struct flex_array *fa);
int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,