diff options
author | James Morris <jmorris@namei.org> | 2011-05-04 05:59:34 +0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-04 05:59:34 +0400 |
commit | 6f239284542bae297d27355d06afbb8df23c5db9 (patch) | |
tree | b0ba42fb54cd05178c61584e0913be38a57f0384 /Documentation | |
parent | 609cfda586c7fe3e5d1a02c51edb587506294167 (diff) | |
parent | bf69d41d198138e3c601e9a6645f4f1369aff7e0 (diff) | |
download | linux-6f239284542bae297d27355d06afbb8df23c5db9.tar.xz |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/flexible-arrays.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/flexible-arrays.txt b/Documentation/flexible-arrays.txt index cb8a3a00cc92..df904aec9904 100644 --- a/Documentation/flexible-arrays.txt +++ b/Documentation/flexible-arrays.txt @@ -66,10 +66,10 @@ trick is to ensure that any needed memory allocations are done before entering atomic context, using: int flex_array_prealloc(struct flex_array *array, unsigned int start, - unsigned int end, gfp_t flags); + unsigned int nr_elements, gfp_t flags); This function will ensure that memory for the elements indexed in the range -defined by start and end has been allocated. Thereafter, a +defined by start and nr_elements has been allocated. Thereafter, a flex_array_put() call on an element in that range is guaranteed not to block. |