diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 16:29:50 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 16:29:50 +0900 |
commit | bd6356bdafc853201168f718f0059fbe11191461 (patch) | |
tree | e2f82e8950b0201ab93c8fa8ff07ac31ba1c2a35 /Documentation/flexible-arrays.txt | |
parent | 3185847957d4834d1b30b253b1c71bb05bad7265 (diff) | |
parent | 4b42120df72aeebd3967c952804cb1af53b91cc5 (diff) | |
download | blackbird-obmc-linux-bd6356bdafc853201168f718f0059fbe11191461.tar.gz blackbird-obmc-linux-bd6356bdafc853201168f718f0059fbe11191461.zip |
Merge branch 'dev/removing-s5p6442' into for-next
Diffstat (limited to 'Documentation/flexible-arrays.txt')
-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. |