mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-22 23:04:43 +00:00
[PATCH] s390: kzalloc() conversion in arch/s390
Convert all kmalloc + memset sequences in arch/s390 to kzalloc usage. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
96641ee1e4
commit
fb630517f0
2 changed files with 4 additions and 10 deletions
|
@ -204,16 +204,13 @@ debug_areas_alloc(int pages_per_area, int nr_areas)
|
|||
goto fail_malloc_areas2;
|
||||
}
|
||||
for(j = 0; j < pages_per_area; j++) {
|
||||
areas[i][j] = (debug_entry_t*)kmalloc(PAGE_SIZE,
|
||||
GFP_KERNEL);
|
||||
areas[i][j] = kzalloc(PAGE_SIZE, GFP_KERNEL);
|
||||
if(!areas[i][j]) {
|
||||
for(j--; j >=0 ; j--) {
|
||||
kfree(areas[i][j]);
|
||||
}
|
||||
kfree(areas[i]);
|
||||
goto fail_malloc_areas2;
|
||||
} else {
|
||||
memset(areas[i][j],0,PAGE_SIZE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -249,14 +246,12 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
|
|||
rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL);
|
||||
if(!rc)
|
||||
goto fail_malloc_rc;
|
||||
rc->active_entries = (int*)kmalloc(nr_areas * sizeof(int), GFP_KERNEL);
|
||||
rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
|
||||
if(!rc->active_entries)
|
||||
goto fail_malloc_active_entries;
|
||||
memset(rc->active_entries, 0, nr_areas * sizeof(int));
|
||||
rc->active_pages = (int*)kmalloc(nr_areas * sizeof(int), GFP_KERNEL);
|
||||
rc->active_pages = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
|
||||
if(!rc->active_pages)
|
||||
goto fail_malloc_active_pages;
|
||||
memset(rc->active_pages, 0, nr_areas * sizeof(int));
|
||||
if((mode == ALL_AREAS) && (pages_per_area != 0)){
|
||||
rc->areas = debug_areas_alloc(pages_per_area, nr_areas);
|
||||
if(!rc->areas)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue