diff --git a/[refs] b/[refs] index d24e1b8c7a11..aa3bf4242870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dcb6d737c8d1a31476cbab4d640022b53070ffa +refs/heads/master: 316b3799880c55bb20f6d2db904245eccc30e25f diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle index 58b0bf917834..fa6e25b94a54 100644 --- a/trunk/Documentation/CodingStyle +++ b/trunk/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: