aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-10-15 11:51:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 18:06:54 -0400
commit70a3075d40154053ad90d342b3dcb1b795c73dbb (patch)
tree8740f15b26908f8ab247b3fc4c96cfaaf88140c9 /arch/frv
parentcb76d5a4c4a74f4ff0bd4db5069f02fe4679a5ed (diff)
FRV: 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. arch/frv/mm/init.c | 2 -- 1 file changed, 2 deletions(-) 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: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/mm/init.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 1b851db34186..0708284f85fb 100644
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -87,8 +87,6 @@ void __init paging_init(void)
87 87
88 pkmap_page_table = alloc_bootmem_pages(PAGE_SIZE); 88 pkmap_page_table = alloc_bootmem_pages(PAGE_SIZE);
89 89
90 memset(pkmap_page_table, 0, PAGE_SIZE);
91
92 pge = swapper_pg_dir + pgd_index_k(PKMAP_BASE); 90 pge = swapper_pg_dir + pgd_index_k(PKMAP_BASE);
93 pue = pud_offset(pge, PKMAP_BASE); 91 pue = pud_offset(pge, PKMAP_BASE);
94 pme = pmd_offset(pue, PKMAP_BASE); 92 pme = pmd_offset(pue, PKMAP_BASE);