diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:21:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:21:08 -0700 |
| commit | 8a3d8ed027b563d2875cd3df816fb4a888a8551e (patch) | |
| tree | 61b5174933a53e7ec6246369c558fcb60e7967d8 /Documentation | |
| parent | 30106b8ce2cc2243514116d6f29086e6deecc754 (diff) | |
| parent | 6f239284542bae297d27355d06afbb8df23c5db9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
flex_arrays: allow zero length flex arrays
flex_array: flex_array_prealloc takes a number of elements, not an end
SELinux: pass last path component in may_create
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. |