diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-06 08:11:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-06 08:11:28 +0200 |
| commit | 4d70230bb46859df6295744f7dcf8c560f01fb8f (patch) | |
| tree | a5b0f219c2f90365136a00b555fdd4fcc07ed3bf /include/linux/flex_array.h | |
| parent | 98bb318864ed10ae374573f1382147f113642059 (diff) | |
| parent | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into perf/urgent
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 70e4efabe0fb..ebeb2f3ad068 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, |