From: Andrew Morton There's no kzalloc_node() in my tree. Cc: Deepak Saxena Signed-off-by: Andrew Morton --- drivers/ide/ide-probe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/ide/ide-probe.c~ide-kmalloc-memset-kzalloc-conversion-fix drivers/ide/ide-probe.c --- devel/drivers/ide/ide-probe.c~ide-kmalloc-memset-kzalloc-conversion-fix 2005-10-14 17:23:39.000000000 -0700 +++ devel-akpm/drivers/ide/ide-probe.c 2005-10-14 17:23:39.000000000 -0700 @@ -1096,13 +1096,14 @@ static int init_irq (ide_hwif_t *hwif) hwgroup->hwif->next = hwif; spin_unlock_irq(&ide_lock); } else { - hwgroup = kzalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL, + hwgroup = kmalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL, hwif_to_node(hwif->drives[0].hwif)); if (!hwgroup) goto out_up; hwif->hwgroup = hwgroup; + memset(hwgroup, 0, sizeof(ide_hwgroup_t)); hwgroup->hwif = hwif->next = hwif; hwgroup->rq = NULL; hwgroup->handler = NULL; _