diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-05-20 15:29:44 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-05-20 15:29:44 -0700 |
| commit | 4c24965e21c2226d2bd3dcd1f81b1b15d2fdf8a9 (patch) | |
| tree | ee67e690a0a85413a0274547e7960a744f815c8c /Documentation | |
| parent | 5ea756bf0d0fbe2837b81365ea5af978e19bec77 (diff) | |
| parent | c5aa2077c8bae6dcb5fc185b029fc084ec4a5202 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38-test
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 cb8a3a00cc9..df904aec990 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. |