summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-06-24 12:35:38 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2011-06-24 12:35:38 +1000
commit9e858933ad11e30ef5c20e1dd16279bc874dd5d4 (patch)
tree80f2f099f2849bb049504eaabb83ba62e1ddf30d /Documentation
parentd0e4819d36eb08994760fd0055873e791c078eb8 (diff)
parent3433fb9f19ab012aca2fb4e142076f24afc9baa1 (diff)
Merge branch 'quilt/kernel-doc'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/CodingStyle4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index 58b0bf917834..fa6e25b94a54 100644
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
@@ -680,8 +680,8 @@ ones already enabled by DEBUG.
Chapter 14: Allocating memory
The kernel provides the following general purpose memory allocators:
-kmalloc(), kzalloc(), kcalloc(), and vmalloc(). Please refer to the API
-documentation for further information about them.
+kmalloc(), kzalloc(), kcalloc(), vmalloc(), and vzalloc(). Please refer to
+the API documentation for further information about them.
The preferred form for passing a size of a struct is the following: