Skip to content

Commit

Permalink
[PATCH] m68k: replace kmalloc+memset with kzalloc
Browse files Browse the repository at this point in the history
Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Yan Burman authored and Linus Torvalds committed Dec 7, 2006
1 parent 58e14b1 commit 8bcbdf6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions arch/m68k/amiga/chipram.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
#ifdef DEBUG
printk("amiga_chip_alloc: allocate %ld bytes\n", size);
#endif
res = kmalloc(sizeof(struct resource), GFP_KERNEL);
res = kzalloc(sizeof(struct resource), GFP_KERNEL);
if (!res)
return NULL;
memset(res, 0, sizeof(struct resource));
res->name = name;

if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
Expand Down
3 changes: 1 addition & 2 deletions arch/m68k/atari/hades-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,9 @@ struct pci_bus_info * __init init_hades_pci(void)
* Allocate memory for bus info structure.
*/

bus = kmalloc(sizeof(struct pci_bus_info), GFP_KERNEL);
bus = kzalloc(sizeof(struct pci_bus_info), GFP_KERNEL);
if (!bus)
return NULL;
memset(bus, 0, sizeof(struct pci_bus_info));

/*
* Claim resources. The m68k has no separate I/O space, both
Expand Down

0 comments on commit 8bcbdf6

Please sign in to comment.