Commit 58a01a45 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds

mm/page_alloc.c: eliminate NULL test and memset after alloc_bootmem

As noted by Akinobu Mita in patch b1fceac2,
alloc_bootmem and related functions never return NULL and always return a
zeroed region of memory.  Thus a NULL test or memset after calls to these
functions is unnecessary.

This was fixed using the following semantic patch.
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
expression E;
statement S;
@@

E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...)
... when != E
(
- BUG_ON (E == NULL);
|
- if (E == NULL) S
)

@@
expression E,E1;
@@

E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...)
... when != E
- memset(E,0,E1);
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cbf84b7a
...@@ -3381,10 +3381,8 @@ static void __init setup_usemap(struct pglist_data *pgdat, ...@@ -3381,10 +3381,8 @@ static void __init setup_usemap(struct pglist_data *pgdat,
{ {
unsigned long usemapsize = usemap_size(zonesize); unsigned long usemapsize = usemap_size(zonesize);
zone->pageblock_flags = NULL; zone->pageblock_flags = NULL;
if (usemapsize) { if (usemapsize)
zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize); zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
memset(zone->pageblock_flags, 0, usemapsize);
}
} }
#else #else
static void inline setup_usemap(struct pglist_data *pgdat, static void inline setup_usemap(struct pglist_data *pgdat,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment