diff --git a/[refs] b/[refs] index 15c905eed121..27afceb31e2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 677243d7494d09bfa782425f063a6013de53c35b +refs/heads/master: 9329ba9704f6bd51a735982e0d4a3eed72c3294f diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c index 0cd4bf61012c..12dea33572bd 100644 --- a/trunk/mm/percpu.c +++ b/trunk/mm/percpu.c @@ -826,8 +826,8 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved) * @size: size of area to allocate in bytes * @align: alignment of area (max PAGE_SIZE) * - * Allocate percpu area of @size bytes aligned at @align. Might - * sleep. Might trigger writeouts. + * Allocate zero-filled percpu area of @size bytes aligned at @align. + * Might sleep. Might trigger writeouts. * * CONTEXT: * Does GFP_KERNEL allocation. @@ -846,9 +846,10 @@ EXPORT_SYMBOL_GPL(__alloc_percpu); * @size: size of area to allocate in bytes * @align: alignment of area (max PAGE_SIZE) * - * Allocate percpu area of @size bytes aligned at @align from reserved - * percpu area if arch has set it up; otherwise, allocation is served - * from the same dynamic area. Might sleep. Might trigger writeouts. + * Allocate zero-filled percpu area of @size bytes aligned at @align + * from reserved percpu area if arch has set it up; otherwise, + * allocation is served from the same dynamic area. Might sleep. + * Might trigger writeouts. * * CONTEXT: * Does GFP_KERNEL allocation.