diff options
author | Julia Lawall <julia@diku.dk> | 2008-07-17 15:16:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:24:40 -0400 |
commit | 7b6b948fc0d60a704c15b1cd72345a98e759dd62 (patch) | |
tree | 0e111fa2eb1a658289c40b7bb64fd481555ef1ef /arch/m68k | |
parent | 3fadd06ebcbff9b0a7c90f68d81250f39bf31db1 (diff) |
arch/m68k/mm/motorola.c: Eliminate NULL test and memset after alloc_bootmem
As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b,
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\)(...)
.. 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\)(...)
.. when != E
- memset(E,0,E1);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/mm/motorola.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 30d34f285024..226795bdf355 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c | |||
@@ -285,7 +285,6 @@ void __init paging_init(void) | |||
285 | * to a couple of allocated pages | 285 | * to a couple of allocated pages |
286 | */ | 286 | */ |
287 | empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); | 287 | empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); |
288 | memset(empty_zero_page, 0, PAGE_SIZE); | ||
289 | 288 | ||
290 | /* | 289 | /* |
291 | * Set up SFC/DFC registers | 290 | * Set up SFC/DFC registers |