Index: linux-2.6.19-rc6-mm2/arch/arm/oprofile/common.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/arch/arm/oprofile/common.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/arch/arm/oprofile/common.c 2006-11-29 19:37:17.000000000 -0800 @@ -140,7 +140,7 @@ if (ret < 0) return ret; - counter_config = kcalloc(spec->num_counters, sizeof(struct op_counter_config), + counter_config = kzalloc(spec->num_counters * sizeof(struct op_counter_config), GFP_KERNEL); if (!counter_config) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/arch/ppc/platforms/katana.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/arch/ppc/platforms/katana.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/arch/ppc/platforms/katana.c 2006-11-29 19:37:17.000000000 -0800 @@ -661,7 +661,7 @@ ptbl_entries = (size >= (64*MB)) ? 6 : 4; - if ((ptbl = kcalloc(ptbl_entries, sizeof(struct mtd_partition), + if ((ptbl = kzalloc(ptbl_entries * sizeof(struct mtd_partition), GFP_KERNEL)) == NULL) { printk(KERN_WARNING "Can't alloc MTD partition table\n"); return -ENOMEM; Index: linux-2.6.19-rc6-mm2/arch/ia64/sn/kernel/io_init.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/arch/ia64/sn/kernel/io_init.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/arch/ia64/sn/kernel/io_init.c 2006-11-29 19:37:17.000000000 -0800 @@ -126,7 +126,7 @@ sn_legacy_pci_window_fixup(struct pci_controller *controller, u64 legacy_io, u64 legacy_mem) { - controller->window = kcalloc(2, sizeof(struct pci_window), + controller->window = kzalloc(2 * sizeof(struct pci_window), GFP_KERNEL); if (controller->window == NULL) BUG(); @@ -167,7 +167,7 @@ return; idx = controller->windows; new_count = controller->windows + count; - new_window = kcalloc(new_count, sizeof(struct pci_window), GFP_KERNEL); + new_window = kzalloc(new_count * sizeof(struct pci_window), GFP_KERNEL); if (new_window == NULL) BUG(); if (controller->window) { Index: linux-2.6.19-rc6-mm2/arch/s390/kernel/debug.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/arch/s390/kernel/debug.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/arch/s390/kernel/debug.c 2006-11-29 19:37:17.000000000 -0800 @@ -245,10 +245,10 @@ rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL); if(!rc) goto fail_malloc_rc; - rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL); + rc->active_entries = kzalloc(nr_areas * sizeof(int), GFP_KERNEL); if(!rc->active_entries) goto fail_malloc_active_entries; - rc->active_pages = kcalloc(nr_areas, sizeof(int), GFP_KERNEL); + rc->active_pages = kzalloc(nr_areas * sizeof(int), GFP_KERNEL); if(!rc->active_pages) goto fail_malloc_active_pages; if((mode == ALL_AREAS) && (pages_per_area != 0)){ Index: linux-2.6.19-rc6-mm2/drivers/ata/pdc_adma.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/ata/pdc_adma.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/ata/pdc_adma.c 2006-11-29 19:37:17.000000000 -0800 @@ -551,7 +551,7 @@ return rc; adma_enter_reg_mode(ap); rc = -ENOMEM; - pp = kcalloc(1, sizeof(*pp), GFP_KERNEL); + pp = kzalloc(sizeof(*pp), GFP_KERNEL); if (!pp) goto err_out; pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma, @@ -672,7 +672,7 @@ if (rc) goto err_out_iounmap; - probe_ent = kcalloc(1, sizeof(*probe_ent), GFP_KERNEL); + probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL); if (probe_ent == NULL) { rc = -ENOMEM; goto err_out_iounmap; Index: linux-2.6.19-rc6-mm2/drivers/atm/firestream.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/atm/firestream.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/atm/firestream.c 2006-11-29 19:37:17.000000000 -0800 @@ -1788,7 +1788,7 @@ write_fs (dev, RAM, (1 << (28 - FS155_VPI_BITS - FS155_VCI_BITS)) - 1); dev->nchannels = FS155_NR_CHANNELS; } - dev->atm_vccs = kcalloc (dev->nchannels, sizeof (struct atm_vcc *), + dev->atm_vccs = kzalloc (dev->nchannels * sizeof (struct atm_vcc *), GFP_KERNEL); fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n", dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *)); Index: linux-2.6.19-rc6-mm2/drivers/net/phy/phy_device.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/phy/phy_device.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/phy/phy_device.c 2006-11-29 19:37:17.000000000 -0800 @@ -50,7 +50,7 @@ struct phy_device *dev; /* We allocate the device, and initialize the * default values */ - dev = kcalloc(1, sizeof(*dev), GFP_KERNEL); + dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (NULL == dev) return (struct phy_device*) PTR_ERR((void*)-ENOMEM); Index: linux-2.6.19-rc6-mm2/drivers/net/pcnet32.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/pcnet32.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/pcnet32.c 2006-11-29 19:37:17.000000000 -0800 @@ -482,7 +482,7 @@ } memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size)); - new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t), + new_dma_addr_list = kzalloc((1 << size) * sizeof(dma_addr_t), GFP_ATOMIC); if (!new_dma_addr_list) { if (netif_msg_drv(lp)) @@ -491,7 +491,7 @@ goto free_new_tx_ring; } - new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *), + new_skb_list = kzalloc((1 << size) * sizeof(struct sk_buff *), GFP_ATOMIC); if (!new_skb_list) { if (netif_msg_drv(lp)) @@ -560,7 +560,7 @@ } memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size)); - new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t), + new_dma_addr_list = kzalloc((1 << size) * sizeof(dma_addr_t), GFP_ATOMIC); if (!new_dma_addr_list) { if (netif_msg_drv(lp)) @@ -569,7 +569,7 @@ goto free_new_rx_ring; } - new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *), + new_skb_list = kzalloc((1 << size) * sizeof(struct sk_buff *), GFP_ATOMIC); if (!new_skb_list) { if (netif_msg_drv(lp)) @@ -2030,7 +2030,7 @@ return -ENOMEM; } - lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t), + lp->tx_dma_addr = kzalloc(lp->tx_ring_size * sizeof(dma_addr_t), GFP_ATOMIC); if (!lp->tx_dma_addr) { if (netif_msg_drv(lp)) @@ -2039,7 +2039,7 @@ return -ENOMEM; } - lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t), + lp->rx_dma_addr = kzalloc(lp->rx_ring_size * sizeof(dma_addr_t), GFP_ATOMIC); if (!lp->rx_dma_addr) { if (netif_msg_drv(lp)) @@ -2048,7 +2048,7 @@ return -ENOMEM; } - lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *), + lp->tx_skbuff = kzalloc(lp->tx_ring_size * sizeof(struct sk_buff *), GFP_ATOMIC); if (!lp->tx_skbuff) { if (netif_msg_drv(lp)) @@ -2057,7 +2057,7 @@ return -ENOMEM; } - lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *), + lp->rx_skbuff = kzalloc(lp->rx_ring_size * sizeof(struct sk_buff *), GFP_ATOMIC); if (!lp->rx_skbuff) { if (netif_msg_drv(lp)) Index: linux-2.6.19-rc6-mm2/drivers/net/netxen/netxen_nic_init.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/netxen/netxen_nic_init.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/netxen/netxen_nic_init.c 2006-11-29 19:37:17.000000000 -0800 @@ -406,7 +406,7 @@ " initialized.\n", __FUNCTION__, n); return -EIO; } - buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL); + buf = kzalloc(n * sizeof(struct crb_addr_pair), GFP_KERNEL); if (buf == NULL) { printk("%s: pinit_from_rom: Unable to calloc memory.\n", netxen_nic_driver_name); Index: linux-2.6.19-rc6-mm2/drivers/net/skge.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/skge.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/skge.c 2006-11-29 19:37:17.000000000 -0800 @@ -749,7 +749,7 @@ struct skge_element *e; int i; - ring->start = kcalloc(sizeof(*e), ring->count, GFP_KERNEL); + ring->start = kzalloc(sizeof(*e) * ring->count, GFP_KERNEL); if (!ring->start) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/drivers/net/sky2.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/sky2.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/sky2.c 2006-11-29 19:37:17.000000000 -0800 @@ -1171,7 +1171,7 @@ if (!sky2->tx_le) goto err_out; - sky2->tx_ring = kcalloc(TX_RING_SIZE, sizeof(struct tx_ring_info), + sky2->tx_ring = kzalloc(TX_RING_SIZE * sizeof(struct tx_ring_info), GFP_KERNEL); if (!sky2->tx_ring) goto err_out; @@ -1183,7 +1183,7 @@ goto err_out; memset(sky2->rx_le, 0, RX_LE_BYTES); - sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info), + sky2->rx_ring = kzalloc(sky2->rx_pending * sizeof(struct rx_ring_info), GFP_KERNEL); if (!sky2->rx_ring) goto err_out; Index: linux-2.6.19-rc6-mm2/drivers/net/wireless/bcm43xx/bcm43xx_dma.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/wireless/bcm43xx/bcm43xx_dma.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/wireless/bcm43xx/bcm43xx_dma.c 2006-11-29 19:37:17.000000000 -0800 @@ -595,7 +595,7 @@ if (for_tx) nr_slots = BCM43xx_TXRING_SLOTS; - ring->meta = kcalloc(nr_slots, sizeof(struct bcm43xx_dmadesc_meta), + ring->meta = kzalloc(nr_slots * sizeof(struct bcm43xx_dmadesc_meta), GFP_KERNEL); if (!ring->meta) goto err_kfree_ring; Index: linux-2.6.19-rc6-mm2/drivers/net/wireless/zd1211rw/zd_usb.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/net/wireless/zd1211rw/zd_usb.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/net/wireless/zd1211rw/zd_usb.c 2006-11-29 19:37:17.000000000 -0800 @@ -713,7 +713,7 @@ dev_dbg_f(zd_usb_dev(usb), "\n"); r = -ENOMEM; - urbs = kcalloc(URBS_COUNT, sizeof(struct urb *), GFP_NOFS); + urbs = kzalloc(URBS_COUNT * sizeof(struct urb *), GFP_NOFS); if (!urbs) goto error; for (i = 0; i < URBS_COUNT; i++) { Index: linux-2.6.19-rc6-mm2/drivers/mtd/rfd_ftl.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/mtd/rfd_ftl.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/mtd/rfd_ftl.c 2006-11-29 19:37:17.000000000 -0800 @@ -187,7 +187,7 @@ if (!part->header_cache) goto err; - part->blocks = kcalloc(part->total_blocks, sizeof(struct block), + part->blocks = kzalloc(part->total_blocks * sizeof(struct block), GFP_KERNEL); if (!part->blocks) goto err; @@ -768,7 +768,7 @@ if (mtd->type != MTD_NORFLASH) return; - part = kcalloc(1, sizeof(struct partition), GFP_KERNEL); + part = kzalloc(sizeof(struct partition), GFP_KERNEL); if (!part) return; Index: linux-2.6.19-rc6-mm2/drivers/pci/hotplug/ibmphp_ebda.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pci/hotplug/ibmphp_ebda.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pci/hotplug/ibmphp_ebda.c 2006-11-29 19:37:17.000000000 -0800 @@ -85,12 +85,12 @@ if (!controller) goto error; - slots = kcalloc(slot_count, sizeof(struct ebda_hpc_slot), GFP_KERNEL); + slots = kzalloc(slot_count * sizeof(struct ebda_hpc_slot), GFP_KERNEL); if (!slots) goto error_contr; controller->slots = slots; - buses = kcalloc(bus_count, sizeof(struct ebda_hpc_bus), GFP_KERNEL); + buses = kzalloc(bus_count * sizeof(struct ebda_hpc_bus), GFP_KERNEL); if (!buses) goto error_slots; controller->buses = buses; Index: linux-2.6.19-rc6-mm2/drivers/pnp/isapnp/core.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pnp/isapnp/core.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pnp/isapnp/core.c 2006-11-29 19:37:17.000000000 -0800 @@ -395,7 +395,7 @@ struct pnp_id * id; if (!dev) return; - id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL); + id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); if (!id) return; sprintf(id->id, "%c%c%c%x%x%x%x", @@ -419,7 +419,7 @@ struct pnp_dev *dev; isapnp_peek(tmp, size); - dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL); + dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL); if (!dev) return NULL; dev->number = number; @@ -450,7 +450,7 @@ unsigned long bits; isapnp_peek(tmp, size); - irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL); + irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); if (!irq) return; bits = (tmp[1] << 8) | tmp[0]; @@ -474,7 +474,7 @@ struct pnp_dma *dma; isapnp_peek(tmp, size); - dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL); + dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL); if (!dma) return; dma->map = tmp[0]; @@ -494,7 +494,7 @@ struct pnp_port *port; isapnp_peek(tmp, size); - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = (tmp[2] << 8) | tmp[1]; @@ -517,7 +517,7 @@ struct pnp_port *port; isapnp_peek(tmp, size); - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = port->max = (tmp[1] << 8) | tmp[0]; @@ -539,7 +539,7 @@ struct pnp_mem *mem; isapnp_peek(tmp, size); - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = ((tmp[2] << 8) | tmp[1]) << 8; @@ -562,7 +562,7 @@ struct pnp_mem *mem; isapnp_peek(tmp, size); - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1]; @@ -584,7 +584,7 @@ struct pnp_mem *mem; isapnp_peek(tmp, size); - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1]; @@ -829,7 +829,7 @@ static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device) { - struct pnp_id * id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL); + struct pnp_id * id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); if (!id) return; sprintf(id->id, "%c%c%c%x%x%x%x", @@ -865,7 +865,7 @@ header[4], header[5], header[6], header[7], header[8]); printk(KERN_DEBUG "checksum = 0x%x\n", checksum); #endif - if ((card = kcalloc(1, sizeof(struct pnp_card), GFP_KERNEL)) == NULL) + if ((card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL) continue; card->number = csn; Index: linux-2.6.19-rc6-mm2/drivers/pnp/pnpacpi/rsparser.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pnp/pnpacpi/rsparser.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pnp/pnpacpi/rsparser.c 2006-11-29 19:37:17.000000000 -0800 @@ -298,7 +298,7 @@ if (p->channel_count == 0) return; - dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL); + dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL); if (!dma) return; @@ -354,7 +354,7 @@ if (p->interrupt_count == 0) return; - irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL); + irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); if (!irq) return; @@ -375,7 +375,7 @@ if (p->interrupt_count == 0) return; - irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL); + irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); if (!irq) return; @@ -396,7 +396,7 @@ if (io->address_length == 0) return; - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = io->minimum; @@ -417,7 +417,7 @@ if (io->address_length == 0) return; - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = port->max = io->address; @@ -436,7 +436,7 @@ if (p->address_length == 0) return; - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = p->minimum; @@ -459,7 +459,7 @@ if (p->address_length == 0) return; - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = p->minimum; @@ -482,7 +482,7 @@ if (p->address_length == 0) return; - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = mem->max = p->address; @@ -514,7 +514,7 @@ return; if (p->resource_type == ACPI_MEMORY_RANGE) { - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = mem->max = p->minimum; @@ -524,7 +524,7 @@ ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0; pnp_register_mem_resource(option, mem); } else if (p->resource_type == ACPI_IO_RANGE) { - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = port->max = p->minimum; @@ -721,7 +721,7 @@ if (!res_cnt) return -EINVAL; buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1; - buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL); + buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL); if (!buffer->pointer) return -ENOMEM; pnp_dbg("Res cnt %d", res_cnt); Index: linux-2.6.19-rc6-mm2/drivers/pnp/pnpacpi/core.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pnp/pnpacpi/core.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pnp/pnpacpi/core.c 2006-11-29 19:37:17.000000000 -0800 @@ -139,7 +139,7 @@ return 0; pnp_dbg("ACPI device : hid %s", acpi_device_hid(device)); - dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL); + dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL); if (!dev) { pnp_err("Out of memory"); return -ENOMEM; @@ -169,7 +169,7 @@ dev->number = num; /* set the initial values for the PnP device */ - dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL); + dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); if (!dev_id) goto err; pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id); @@ -201,7 +201,7 @@ for (i = 0; i < cid_list->count; i++) { if (!ispnpidacpi(cid_list->id[i].value)) continue; - dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL); + dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); if (!dev_id) continue; Index: linux-2.6.19-rc6-mm2/drivers/pnp/pnpbios/rsparser.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pnp/pnpbios/rsparser.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pnp/pnpbios/rsparser.c 2006-11-29 19:37:17.000000000 -0800 @@ -248,7 +248,7 @@ pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option) { struct pnp_mem * mem; - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = ((p[5] << 8) | p[4]) << 8; @@ -264,7 +264,7 @@ pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option) { struct pnp_mem * mem; - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4]; @@ -280,7 +280,7 @@ pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option) { struct pnp_mem * mem; - mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); + mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); if (!mem) return; mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4]; @@ -297,7 +297,7 @@ struct pnp_irq * irq; unsigned long bits; - irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL); + irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); if (!irq) return; bits = (p[2] << 8) | p[1]; @@ -314,7 +314,7 @@ pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option) { struct pnp_dma * dma; - dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL); + dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL); if (!dma) return; dma->map = p[1]; @@ -327,7 +327,7 @@ pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option) { struct pnp_port * port; - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = (p[3] << 8) | p[2]; @@ -343,7 +343,7 @@ pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option) { struct pnp_port * port; - port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); + port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); if (!port) return; port->min = port->max = (p[2] << 8) | p[1]; @@ -527,7 +527,7 @@ case SMALL_TAG_COMPATDEVID: /* compatible ID */ if (len != 4) goto len_err; - dev_id = kcalloc(1, sizeof (struct pnp_id), GFP_KERNEL); + dev_id = kzalloc(sizeof (struct pnp_id), GFP_KERNEL); if (!dev_id) return NULL; memset(dev_id, 0, sizeof(struct pnp_id)); Index: linux-2.6.19-rc6-mm2/drivers/pnp/pnpbios/core.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pnp/pnpbios/core.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pnp/pnpbios/core.c 2006-11-29 19:37:17.000000000 -0800 @@ -109,10 +109,10 @@ if (!current->fs->root) { return -EAGAIN; } - if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) { + if (!(envp = (char **) kzalloc (20 * sizeof (char *), GFP_KERNEL))) { return -ENOMEM; } - if (!(buf = kcalloc (1, 256, GFP_KERNEL))) { + if (!(buf = kzalloc (256, GFP_KERNEL))) { kfree (envp); return -ENOMEM; } @@ -220,7 +220,7 @@ if(!pnpbios_is_dynamic(dev)) return -EPERM; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return -1; if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) { @@ -243,7 +243,7 @@ if (!pnpbios_is_dynamic(dev)) return -EPERM; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return -1; if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) { @@ -294,7 +294,7 @@ if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev)) return -EPERM; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return -ENOMEM; @@ -336,7 +336,7 @@ } /* set the initial values for the PnP device */ - dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL); + dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); if (!dev_id) return -1; pnpid32_to_pnpid(node->eisa_id,id); @@ -374,7 +374,7 @@ struct pnp_bios_node *node; struct pnp_dev *dev; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return; @@ -391,7 +391,7 @@ break; } nodes_got++; - dev = kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL); + dev = kzalloc(sizeof (struct pnp_dev), GFP_KERNEL); if (!dev) break; if(insert_device(dev,node)<0) Index: linux-2.6.19-rc6-mm2/drivers/pnp/pnpbios/proc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pnp/pnpbios/proc.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pnp/pnpbios/proc.c 2006-11-29 19:37:17.000000000 -0800 @@ -87,7 +87,7 @@ return -EFBIG; } - tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL); + tmpbuf = kzalloc(escd.escd_size, GFP_KERNEL); if (!tmpbuf) return -ENOMEM; if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) { @@ -133,7 +133,7 @@ if (pos >= 0xff) return 0; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return -ENOMEM; for (nodenum=pos; nodenum<0xff; ) { @@ -168,7 +168,7 @@ u8 nodenum = (long)data; int len; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return -ENOMEM; if (pnp_bios_get_dev_node(&nodenum, boot, node)) { kfree(node); @@ -188,7 +188,7 @@ u8 nodenum = (long)data; int ret = count; - node = kcalloc(1, node_info.max_node_size, GFP_KERNEL); + node = kzalloc(node_info.max_node_size, GFP_KERNEL); if (!node) return -ENOMEM; if (pnp_bios_get_dev_node(&nodenum, boot, node)) { Index: linux-2.6.19-rc6-mm2/drivers/usb/net/rndis_host.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/net/rndis_host.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/net/rndis_host.c 2006-11-29 19:37:17.000000000 -0800 @@ -469,7 +469,7 @@ struct rndis_halt *halt; /* try to clear any rndis state/activity (no i/o from stack!) */ - halt = kcalloc(1, sizeof *halt, GFP_KERNEL); + halt = kzalloc(sizeof *halt, GFP_KERNEL); if (halt) { halt->msg_type = RNDIS_MSG_HALT; halt->msg_len = ccpu2(sizeof *halt); Index: linux-2.6.19-rc6-mm2/drivers/usb/host/ehci-mem.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/host/ehci-mem.c 2006-11-29 19:36:05.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/host/ehci-mem.c 2006-11-29 19:37:17.000000000 -0800 @@ -231,7 +231,7 @@ scheduling is merely constrained */ if(ehci->fstn_pool) ehci->periodic_save_fstns = - kcalloc(PERIODIC_QH_MAX_PERIOD, + kzalloc(PERIODIC_QH_MAX_PERIOD * sizeof(*ehci->periodic_save_fstns), flags); /* lazy-alloc the rest */ @@ -288,7 +288,7 @@ ehci->periodic [i] = EHCI_LIST_END; /* budgeting placeholders */ - ehci->budget = kcalloc(BUDGET_SLOTS, sizeof(*ehci->budget), flags); + ehci->budget = kzalloc(BUDGET_SLOTS * sizeof(*ehci->budget), flags); if (ehci->budget == NULL){ goto fail; } @@ -302,7 +302,7 @@ goto fail; /* software shadow of hardware table */ - ehci->pshadow = kcalloc(ehci->periodic_size, sizeof(void *), flags); + ehci->pshadow = kzalloc(ehci->periodic_size * sizeof(void *), flags); if (ehci->pshadow != NULL) return 0; Index: linux-2.6.19-rc6-mm2/drivers/usb/host/uhci-hcd.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/host/uhci-hcd.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/host/uhci-hcd.c 2006-11-29 19:37:17.000000000 -0800 @@ -558,7 +558,7 @@ } memset(uhci->frame, 0, UHCI_NUMFRAMES * sizeof(*uhci->frame)); - uhci->frame_cpu = kcalloc(UHCI_NUMFRAMES, sizeof(*uhci->frame_cpu), + uhci->frame_cpu = kzalloc(UHCI_NUMFRAMES * sizeof(*uhci->frame_cpu), GFP_KERNEL); if (!uhci->frame_cpu) { dev_err(uhci_dev(uhci), "unable to allocate " Index: linux-2.6.19-rc6-mm2/drivers/usb/misc/usbtest.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/misc/usbtest.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/misc/usbtest.c 2006-11-29 19:37:17.000000000 -0800 @@ -855,7 +855,7 @@ * as with bulk/intr sglists, sglen is the queue depth; it also * controls which subtests run (more tests than sglen) or rerun. */ - urb = kcalloc(param->sglen, sizeof(struct urb *), GFP_KERNEL); + urb = kzalloc(param->sglen * sizeof(struct urb *), GFP_KERNEL); if (!urb) return -ENOMEM; for (i = 0; i < param->sglen; i++) { Index: linux-2.6.19-rc6-mm2/drivers/usb/misc/uss720.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/misc/uss720.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/misc/uss720.c 2006-11-29 19:37:17.000000000 -0800 @@ -705,7 +705,7 @@ /* * Allocate parport interface */ - if (!(priv = kcalloc(sizeof(struct parport_uss720_private), 1, GFP_KERNEL))) { + if (!(priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL))) { usb_put_dev(usbdev); return -ENOMEM; } Index: linux-2.6.19-rc6-mm2/drivers/usb/storage/alauda.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/storage/alauda.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/storage/alauda.c 2006-11-29 19:37:17.000000000 -0800 @@ -330,8 +330,8 @@ num_zones = MEDIA_INFO(us).capacity >> (MEDIA_INFO(us).zoneshift + MEDIA_INFO(us).blockshift + MEDIA_INFO(us).pageshift); - MEDIA_INFO(us).pba_to_lba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO); - MEDIA_INFO(us).lba_to_pba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO); + MEDIA_INFO(us).pba_to_lba = kzalloc(num_zones * sizeof(u16*), GFP_NOIO); + MEDIA_INFO(us).lba_to_pba = kzalloc(num_zones * sizeof(u16*), GFP_NOIO); if (alauda_reset_media(us) != USB_STOR_XFER_GOOD) return USB_STOR_TRANSPORT_ERROR; @@ -459,8 +459,8 @@ unsigned int lba_offset, lba_real, blocknum; unsigned int zone_base_lba = zone * uzonesize; unsigned int zone_base_pba = zone * zonesize; - u16 *lba_to_pba = kcalloc(zonesize, sizeof(u16), GFP_NOIO); - u16 *pba_to_lba = kcalloc(zonesize, sizeof(u16), GFP_NOIO); + u16 *lba_to_pba = kzalloc(zonesize * sizeof(u16), GFP_NOIO); + u16 *pba_to_lba = kzalloc(zonesize * sizeof(u16), GFP_NOIO); if (lba_to_pba == NULL || pba_to_lba == NULL) { result = USB_STOR_TRANSPORT_ERROR; goto error; Index: linux-2.6.19-rc6-mm2/drivers/usb/gadget/at91_udc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/gadget/at91_udc.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/gadget/at91_udc.c 2006-11-29 19:37:17.000000000 -0800 @@ -598,7 +598,7 @@ { struct at91_request *req; - req = kcalloc(1, sizeof (struct at91_request), gfp_flags); + req = kzalloc(sizeof (struct at91_request), gfp_flags); if (!req) return NULL; Index: linux-2.6.19-rc6-mm2/drivers/usb/serial/cp2101.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/usb/serial/cp2101.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/usb/serial/cp2101.c 2006-11-29 19:37:17.000000000 -0800 @@ -174,7 +174,7 @@ /* Number of integers required to contain the array */ length = (((size - 1) | 3) + 1)/4; - buf = kcalloc(length, sizeof(u32), GFP_KERNEL); + buf = kzalloc(length * sizeof(u32), GFP_KERNEL); if (!buf) { dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__); return -ENOMEM; Index: linux-2.6.19-rc6-mm2/drivers/char/drm/drmP.h =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/char/drm/drmP.h 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/char/drm/drmP.h 2006-11-29 19:37:17.000000000 -0800 @@ -1127,10 +1127,10 @@ kfree(pt); } -/** Wrapper around kcalloc() */ +/** Wrapper around kzalloc() */ static __inline__ void *drm_calloc(size_t nmemb, size_t size, int area) { - return kcalloc(nmemb, size, GFP_KERNEL); + return kzalloc(nmemb * size, GFP_KERNEL); } #else extern void *drm_alloc(size_t size, int area); Index: linux-2.6.19-rc6-mm2/drivers/char/sx.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/char/sx.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/char/sx.c 2006-11-29 19:37:17.000000000 -0800 @@ -2392,7 +2392,7 @@ /* Many drivers statically allocate the maximum number of ports There is no reason not to allocate them dynamically. Is there? -- REW */ - sx_ports = kcalloc(nports, sizeof(struct sx_port), GFP_KERNEL); + sx_ports = kzalloc(nports * sizeof(struct sx_port), GFP_KERNEL); if (!sx_ports) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/drivers/s390/net/fsm.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/s390/net/fsm.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/s390/net/fsm.c 2006-11-29 19:37:17.000000000 -0800 @@ -41,7 +41,7 @@ f->state_names = state_names; this->f = f; - m = kcalloc(nr_states*nr_events, sizeof(fsm_function_t), order); + m = kzalloc(nr_states * nr_events * sizeof(fsm_function_t), order); if (m == NULL) { printk(KERN_WARNING "fsm(%s): init_fsm: Couldn't alloc jumptable\n", name); Index: linux-2.6.19-rc6-mm2/drivers/s390/net/iucv.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/s390/net/iucv.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/s390/net/iucv.c 2006-11-29 19:37:17.000000000 -0800 @@ -786,7 +786,7 @@ } max_connections = iucv_query_maxconn(); - iucv_pathid_table = kcalloc(max_connections, sizeof(handler *), + iucv_pathid_table = kzalloc(max_connections * sizeof(handler *), GFP_ATOMIC); if (iucv_pathid_table == NULL) { printk(KERN_WARNING "%s: iucv_pathid_table storage " Index: linux-2.6.19-rc6-mm2/drivers/s390/net/qeth_eddp.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/s390/net/qeth_eddp.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/s390/net/qeth_eddp.c 2006-11-29 19:37:17.000000000 -0800 @@ -551,7 +551,7 @@ kfree(ctx); return NULL; } - ctx->pages = kcalloc(ctx->num_pages, sizeof(u8 *), GFP_ATOMIC); + ctx->pages = kzalloc(ctx->num_pages * sizeof(u8 *), GFP_ATOMIC); if (ctx->pages == NULL){ QETH_DBF_TEXT(trace, 2, "ceddpcn2"); kfree(ctx); @@ -568,7 +568,7 @@ memset(addr, 0, PAGE_SIZE); ctx->pages[i] = addr; } - ctx->elements = kcalloc(ctx->num_elements, + ctx->elements = kzalloc(ctx->num_elements * sizeof(struct qeth_eddp_element), GFP_ATOMIC); if (ctx->elements == NULL){ QETH_DBF_TEXT(trace, 2, "ceddpcn4"); Index: linux-2.6.19-rc6-mm2/drivers/s390/char/tape_core.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/s390/char/tape_core.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/s390/char/tape_core.c 2006-11-29 19:37:17.000000000 -0800 @@ -663,7 +663,7 @@ } /* allocate channel program */ if (cplength > 0) { - request->cpaddr = kcalloc(cplength, sizeof(struct ccw1), + request->cpaddr = kzalloc(cplength * sizeof(struct ccw1), GFP_ATOMIC | GFP_DMA); if (request->cpaddr == NULL) { DBF_EXCEPTION(1, "cqra nomem\n"); Index: linux-2.6.19-rc6-mm2/drivers/s390/scsi/zfcp_aux.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/s390/scsi/zfcp_aux.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/s390/scsi/zfcp_aux.c 2006-11-29 19:37:17.000000000 -0800 @@ -123,7 +123,7 @@ { int i; - adapter->req_list = kcalloc(REQUEST_LIST_SIZE, sizeof(struct list_head), + adapter->req_list = kzalloc(REQUEST_LIST_SIZE * sizeof(struct list_head), GFP_KERNEL); if (!adapter->req_list) @@ -618,7 +618,7 @@ sg_list->count = size >> PAGE_SHIFT; if (size & ~PAGE_MASK) sg_list->count++; - sg_list->sg = kcalloc(sg_list->count, sizeof(struct scatterlist), + sg_list->sg = kzalloc(sg_list->count * sizeof(struct scatterlist), GFP_KERNEL); if (sg_list->sg == NULL) { sg_list->count = 0; Index: linux-2.6.19-rc6-mm2/drivers/s390/block/dasd.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/s390/block/dasd.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/s390/block/dasd.c 2006-11-29 19:37:17.000000000 -0800 @@ -576,7 +576,7 @@ return ERR_PTR(-ENOMEM); cqr->cpaddr = NULL; if (cplength > 0) { - cqr->cpaddr = kcalloc(cplength, sizeof(struct ccw1), + cqr->cpaddr = kzalloc(cplength * sizeof(struct ccw1), GFP_ATOMIC | GFP_DMA); if (cqr->cpaddr == NULL) { kfree(cqr); Index: linux-2.6.19-rc6-mm2/drivers/scsi/ibmvscsi/ibmvscsi.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/scsi/ibmvscsi/ibmvscsi.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/scsi/ibmvscsi/ibmvscsi.c 2006-11-29 19:37:17.000000000 -0800 @@ -121,7 +121,7 @@ pool->size = size; pool->next = 0; - pool->events = kcalloc(pool->size, sizeof(*pool->events), GFP_KERNEL); + pool->events = kzalloc(pool->size * sizeof(*pool->events), GFP_KERNEL); if (!pool->events) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/drivers/scsi/sym53c8xx_2/sym_hipd.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/scsi/sym53c8xx_2/sym_hipd.c 2006-11-29 19:37:17.000000000 -0800 @@ -4930,7 +4930,7 @@ * Allocate the table of pointers for LUN(s) > 0, if needed. */ if (ln && !tp->lunmp) { - tp->lunmp = kcalloc(SYM_CONF_MAX_LUN, sizeof(struct sym_lcb *), + tp->lunmp = kzalloc(SYM_CONF_MAX_LUN * sizeof(struct sym_lcb *), GFP_KERNEL); if (!tp->lunmp) goto fail; @@ -4997,7 +4997,7 @@ lp->itlq_tbl = sym_calloc_dma(SYM_CONF_MAX_TASK*4, "ITLQ_TBL"); if (!lp->itlq_tbl) goto fail; - lp->cb_tags = kcalloc(SYM_CONF_MAX_TASK, 1, GFP_ATOMIC); + lp->cb_tags = kzalloc(SYM_CONF_MAX_TASK, GFP_ATOMIC); if (!lp->cb_tags) { sym_mfree_dma(lp->itlq_tbl, SYM_CONF_MAX_TASK*4, "ITLQ_TBL"); lp->itlq_tbl = NULL; @@ -5545,7 +5545,7 @@ /* * Allocate the array of lists of CCBs hashed by DSA. */ - np->ccbh = kcalloc(sizeof(struct sym_ccb **), CCB_HASH_SIZE, GFP_KERNEL); + np->ccbh = kzalloc(sizeof(struct sym_ccb **) * CCB_HASH_SIZE, GFP_KERNEL); if (!np->ccbh) goto attach_failed; Index: linux-2.6.19-rc6-mm2/drivers/infiniband/core/sysfs.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/infiniband/core/sysfs.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/infiniband/core/sysfs.c 2006-11-29 19:37:17.000000000 -0800 @@ -461,7 +461,7 @@ struct port_table_attribute *element; int i; - tab_attr = kcalloc(1 + len, sizeof(struct attribute *), GFP_KERNEL); + tab_attr = kzalloc((1 + len) * sizeof(struct attribute *), GFP_KERNEL); if (!tab_attr) return NULL; Index: linux-2.6.19-rc6-mm2/drivers/block/aoe/aoedev.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/block/aoe/aoedev.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/block/aoe/aoedev.c 2006-11-29 19:37:17.000000000 -0800 @@ -63,7 +63,7 @@ struct frame *f, *e; d = kzalloc(sizeof *d, GFP_ATOMIC); - f = kcalloc(nframes, sizeof *f, GFP_ATOMIC); + f = kzalloc(nframes * sizeof *f, GFP_ATOMIC); switch (!d || !f) { case 0: d->nframes = nframes; Index: linux-2.6.19-rc6-mm2/drivers/block/pktcdvd.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/block/pktcdvd.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/block/pktcdvd.c 2006-11-29 19:37:17.000000000 -0800 @@ -531,7 +531,7 @@ goto no_bio; bio_init(bio); - bvl = kcalloc(nr_iovecs, sizeof(struct bio_vec), GFP_KERNEL); + bvl = kzalloc(nr_iovecs * sizeof(struct bio_vec), GFP_KERNEL); if (!bvl) goto no_bvl; Index: linux-2.6.19-rc6-mm2/drivers/input/ff-core.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/input/ff-core.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/input/ff-core.c 2006-11-29 19:37:18.000000000 -0800 @@ -317,7 +317,7 @@ if (!ff) return -ENOMEM; - ff->effects = kcalloc(max_effects, sizeof(struct ff_effect), + ff->effects = kzalloc(max_effects * sizeof(struct ff_effect), GFP_KERNEL); if (!ff->effects) { kfree(ff); Index: linux-2.6.19-rc6-mm2/drivers/media/dvb/dvb-core/dvb_ca_en50221.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2006-11-29 19:37:18.000000000 -0800 @@ -1677,7 +1677,7 @@ ca->pub = pubca; ca->flags = flags; ca->slot_count = slot_count; - if ((ca->slot_info = kcalloc(slot_count, sizeof(struct dvb_ca_slot), GFP_KERNEL)) == NULL) { + if ((ca->slot_info = kzalloc(slot_count * sizeof(struct dvb_ca_slot), GFP_KERNEL)) == NULL) { ret = -ENOMEM; goto error; } Index: linux-2.6.19-rc6-mm2/drivers/media/video/video-buf.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/media/video/video-buf.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/media/video/video-buf.c 2006-11-29 19:37:18.000000000 -0800 @@ -57,7 +57,7 @@ struct page *pg; int i; - sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL); + sglist = kzalloc(nr_pages * sizeof(struct scatterlist), GFP_KERNEL); if (NULL == sglist) return NULL; for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) { @@ -83,7 +83,7 @@ if (NULL == pages[0]) return NULL; - sglist = kcalloc(nr_pages, sizeof(*sglist), GFP_KERNEL); + sglist = kzalloc(nr_pages * sizeof(*sglist), GFP_KERNEL); if (NULL == sglist) return NULL; Index: linux-2.6.19-rc6-mm2/drivers/media/common/saa7146_core.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/media/common/saa7146_core.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/media/common/saa7146_core.c 2006-11-29 19:37:18.000000000 -0800 @@ -109,7 +109,7 @@ struct page *pg; int i; - sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL); + sglist = kzalloc(nr_pages * sizeof(struct scatterlist), GFP_KERNEL); if (NULL == sglist) return NULL; for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) { Index: linux-2.6.19-rc6-mm2/drivers/message/fusion/mptfc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/message/fusion/mptfc.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/message/fusion/mptfc.c 2006-11-29 19:37:18.000000000 -0800 @@ -1218,7 +1218,7 @@ /* SCSI needs scsi_cmnd lookup table! * (with size equal to req_depth*PtrSz!) */ - hd->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC); + hd->ScsiLookup = kzalloc(ioc->req_depth * sizeof(void *), GFP_ATOMIC); if (!hd->ScsiLookup) { error = -ENOMEM; goto out_mptfc_probe; @@ -1232,7 +1232,7 @@ * indicates a device exists. * max_id = 1 + maximum id (hosts.h) */ - hd->Targets = kcalloc(sh->max_id, sizeof(void *), GFP_ATOMIC); + hd->Targets = kzalloc(sh->max_id * sizeof(void *), GFP_ATOMIC); if (!hd->Targets) { error = -ENOMEM; goto out_mptfc_probe; Index: linux-2.6.19-rc6-mm2/drivers/message/fusion/mptlan.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/message/fusion/mptlan.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/message/fusion/mptlan.c 2006-11-29 19:37:18.000000000 -0800 @@ -411,7 +411,7 @@ goto out; priv->mpt_txfidx_tail = -1; - priv->SendCtl = kcalloc(priv->tx_max_out, sizeof(struct BufferControl), + priv->SendCtl = kzalloc(priv->tx_max_out * sizeof(struct BufferControl), GFP_KERNEL); if (priv->SendCtl == NULL) goto out_mpt_txfidx; @@ -426,7 +426,7 @@ goto out_SendCtl; priv->mpt_rxfidx_tail = -1; - priv->RcvCtl = kcalloc(priv->max_buckets_out, + priv->RcvCtl = kzalloc(priv->max_buckets_out * sizeof(struct BufferControl), GFP_KERNEL); if (priv->RcvCtl == NULL) Index: linux-2.6.19-rc6-mm2/drivers/message/fusion/mptsas.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/message/fusion/mptsas.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/message/fusion/mptsas.c 2006-11-29 19:37:18.000000000 -0800 @@ -1105,7 +1105,7 @@ goto out_free_consistent; port_info->num_phys = buffer->NumPhys; - port_info->phy_info = kcalloc(port_info->num_phys, + port_info->phy_info = kzalloc(port_info->num_phys * sizeof(*port_info->phy_info),GFP_KERNEL); if (!port_info->phy_info) { error = -ENOMEM; @@ -1324,7 +1324,7 @@ /* save config data */ port_info->num_phys = buffer->NumPhys; port_info->handle = le16_to_cpu(buffer->DevHandle); - port_info->phy_info = kcalloc(port_info->num_phys, + port_info->phy_info = kzalloc(port_info->num_phys * sizeof(*port_info->phy_info),GFP_KERNEL); if (!port_info->phy_info) { error = -ENOMEM; @@ -2662,7 +2662,7 @@ /* SCSI needs scsi_cmnd lookup table! * (with size equal to req_depth*PtrSz!) */ - hd->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC); + hd->ScsiLookup = kzalloc(ioc->req_depth * sizeof(void *), GFP_ATOMIC); if (!hd->ScsiLookup) { error = -ENOMEM; goto out_mptsas_probe; @@ -2676,7 +2676,7 @@ * indicates a device exists. * max_id = 1 + maximum id (hosts.h) */ - hd->Targets = kcalloc(sh->max_id, sizeof(void *), GFP_ATOMIC); + hd->Targets = kzalloc(sh->max_id * sizeof(void *), GFP_ATOMIC); if (!hd->Targets) { error = -ENOMEM; goto out_mptsas_probe; Index: linux-2.6.19-rc6-mm2/drivers/message/fusion/mptspi.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/message/fusion/mptspi.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/message/fusion/mptspi.c 2006-11-29 19:37:18.000000000 -0800 @@ -997,7 +997,7 @@ /* SCSI needs scsi_cmnd lookup table! * (with size equal to req_depth*PtrSz!) */ - hd->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC); + hd->ScsiLookup = kzalloc(ioc->req_depth * sizeof(void *), GFP_ATOMIC); if (!hd->ScsiLookup) { error = -ENOMEM; goto out_mptspi_probe; @@ -1011,7 +1011,7 @@ * indicates a device exists. * max_id = 1 + maximum id (hosts.h) */ - hd->Targets = kcalloc(sh->max_id * (sh->max_channel + 1), + hd->Targets = kzalloc(sh->max_id * (sh->max_channel + 1) * sizeof(void *), GFP_ATOMIC); if (!hd->Targets) { error = -ENOMEM; Index: linux-2.6.19-rc6-mm2/drivers/ieee1394/nodemgr.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/ieee1394/nodemgr.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/ieee1394/nodemgr.c 2006-11-29 19:37:18.000000000 -0800 @@ -784,7 +784,7 @@ mutex_unlock(&nodemgr_serialize_remove_uds); return; } - unreg = kcalloc(count, sizeof(*unreg), GFP_KERNEL); + unreg = kzalloc(count * sizeof(*unreg), GFP_KERNEL); if (!unreg) { HPSB_ERR("NodeMgr: out of memory in nodemgr_remove_uds"); up(&nodemgr_ud_class.sem); Index: linux-2.6.19-rc6-mm2/drivers/pcmcia/omap_cf.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pcmcia/omap_cf.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pcmcia/omap_cf.c 2006-11-29 19:37:18.000000000 -0800 @@ -220,7 +220,7 @@ if (irq < 0) return -EINVAL; - cf = kcalloc(1, sizeof *cf, GFP_KERNEL); + cf = kzalloc(sizeof *cf, GFP_KERNEL); if (!cf) return -ENOMEM; init_timer(&cf->timer); Index: linux-2.6.19-rc6-mm2/drivers/pcmcia/at91_cf.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/pcmcia/at91_cf.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/pcmcia/at91_cf.c 2006-11-29 19:37:18.000000000 -0800 @@ -229,7 +229,7 @@ if (!io) return -ENODEV; - cf = kcalloc(1, sizeof *cf, GFP_KERNEL); + cf = kzalloc(sizeof *cf, GFP_KERNEL); if (!cf) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/drivers/macintosh/smu.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/drivers/macintosh/smu.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/drivers/macintosh/smu.c 2006-11-29 19:37:18.000000000 -0800 @@ -945,7 +945,7 @@ */ tlen = sizeof(struct property) + len + 18; - prop = kcalloc(tlen, 1, GFP_KERNEL); + prop = kzalloc(tlen, GFP_KERNEL); if (prop == NULL) return NULL; hdr = (struct smu_sdbp_header *)(prop + 1); Index: linux-2.6.19-rc6-mm2/fs/dlm/config.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/dlm/config.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/dlm/config.c 2006-11-29 19:37:18.000000000 -0800 @@ -301,7 +301,7 @@ void *gps = NULL; cl = kzalloc(sizeof(struct cluster), GFP_KERNEL); - gps = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL); + gps = kzalloc(3 * sizeof(struct config_group *), GFP_KERNEL); sps = kzalloc(sizeof(struct spaces), GFP_KERNEL); cms = kzalloc(sizeof(struct comms), GFP_KERNEL); @@ -361,7 +361,7 @@ void *gps = NULL; sp = kzalloc(sizeof(struct space), GFP_KERNEL); - gps = kcalloc(2, sizeof(struct config_group *), GFP_KERNEL); + gps = kzalloc(2 * sizeof(struct config_group *), GFP_KERNEL); nds = kzalloc(sizeof(struct nodes), GFP_KERNEL); if (!sp || !gps || !nds) @@ -685,7 +685,7 @@ goto out; } - ids = kcalloc(sp->members_count, sizeof(int), GFP_KERNEL); + ids = kzalloc(sp->members_count * sizeof(int), GFP_KERNEL); if (!ids) { rv = -ENOMEM; goto out; Index: linux-2.6.19-rc6-mm2/fs/nfs/read.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/nfs/read.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/nfs/read.c 2006-11-29 19:37:18.000000000 -0800 @@ -55,7 +55,7 @@ if (pagecount <= ARRAY_SIZE(p->page_array)) p->pagevec = p->page_array; else { - p->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS); + p->pagevec = kzalloc(pagecount * sizeof(struct page *), GFP_NOFS); if (!p->pagevec) { mempool_free(p, nfs_rdata_mempool); p = NULL; Index: linux-2.6.19-rc6-mm2/fs/nfs/write.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/nfs/write.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/nfs/write.c 2006-11-29 19:37:18.000000000 -0800 @@ -121,7 +121,7 @@ if (pagecount <= ARRAY_SIZE(p->page_array)) p->pagevec = p->page_array; else { - p->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS); + p->pagevec = kzalloc(pagecount * sizeof(struct page *), GFP_NOFS); if (!p->pagevec) { mempool_free(p, nfs_wdata_mempool); p = NULL; Index: linux-2.6.19-rc6-mm2/fs/cifs/connect.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/cifs/connect.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/cifs/connect.c 2006-11-29 19:37:18.000000000 -0800 @@ -2286,7 +2286,7 @@ kzalloc(2, GFP_KERNEL); } } else { /* no room so create dummy domain and NOS string */ - /* if these kcallocs fail not much we + /* if these kzallocs fail not much we can do, but better to not fail the sesssetup itself */ kfree(ses->serverDomain); Index: linux-2.6.19-rc6-mm2/fs/gfs2/dir.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/gfs2/dir.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/gfs2/dir.c 2006-11-29 19:37:18.000000000 -0800 @@ -1090,7 +1090,7 @@ /* Allocate both the "from" and "to" buffers in one big chunk */ - buf = kcalloc(3, sdp->sd_hash_bsize, GFP_KERNEL | __GFP_NOFAIL); + buf = kzalloc(3 * sdp->sd_hash_bsize, GFP_KERNEL | __GFP_NOFAIL); for (block = dip->i_di.di_size >> sdp->sd_hash_bsize_shift; block--;) { error = gfs2_dir_read_data(dip, (char *)buf, Index: linux-2.6.19-rc6-mm2/fs/gfs2/eattr.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/gfs2/eattr.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/gfs2/eattr.c 2006-11-29 19:37:18.000000000 -0800 @@ -450,7 +450,7 @@ unsigned int x; int error = 0; - bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_KERNEL); + bh = kzalloc(nptrs * sizeof(struct buffer_head *), GFP_KERNEL); if (!bh) return -ENOMEM; @@ -1211,7 +1211,7 @@ unsigned int x; int error; - bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_KERNEL); + bh = kzalloc(nptrs * sizeof(struct buffer_head *), GFP_KERNEL); if (!bh) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/fs/gfs2/quota.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/gfs2/quota.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/gfs2/quota.c 2006-11-29 19:37:18.000000000 -0800 @@ -649,7 +649,7 @@ gfs2_write_calc_reserv(ip, sizeof(struct gfs2_quota), &data_blocks, &ind_blocks); - ghs = kcalloc(num_qd, sizeof(struct gfs2_holder), GFP_KERNEL); + ghs = kzalloc(num_qd * sizeof(struct gfs2_holder), GFP_KERNEL); if (!ghs) return -ENOMEM; @@ -998,7 +998,7 @@ sdp->sd_quota_sync_gen++; - qda = kcalloc(max_qd, sizeof(struct gfs2_quota_data *), GFP_KERNEL); + qda = kzalloc(max_qd * sizeof(struct gfs2_quota_data *), GFP_KERNEL); if (!qda) return -ENOMEM; @@ -1070,7 +1070,7 @@ error = -ENOMEM; - sdp->sd_quota_bitmap = kcalloc(sdp->sd_quota_chunks, + sdp->sd_quota_bitmap = kzalloc(sdp->sd_quota_chunks * sizeof(unsigned char *), GFP_KERNEL); if (!sdp->sd_quota_bitmap) return error; Index: linux-2.6.19-rc6-mm2/fs/gfs2/super.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/gfs2/super.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/gfs2/super.c 2006-11-29 19:37:18.000000000 -0800 @@ -793,7 +793,7 @@ int error = 0, err; memset(sc, 0, sizeof(struct gfs2_statfs_change_host)); - gha = kcalloc(slots, sizeof(struct gfs2_holder), GFP_KERNEL); + gha = kzalloc(slots * sizeof(struct gfs2_holder), GFP_KERNEL); if (!gha) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/fs/gfs2/glock.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/gfs2/glock.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/gfs2/glock.c 2006-11-29 19:37:18.000000000 -0800 @@ -1540,7 +1540,7 @@ return gfs2_glock_nq(ghs); } - e = kcalloc(num_gh, sizeof(struct gfs2_holder *), GFP_KERNEL); + e = kzalloc(num_gh * sizeof(struct gfs2_holder *), GFP_KERNEL); if (!e) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/fs/gfs2/rgrp.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/gfs2/rgrp.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/gfs2/rgrp.c 2006-11-29 19:37:18.000000000 -0800 @@ -374,7 +374,7 @@ if (!length) return -EINVAL; - rgd->rd_bits = kcalloc(length, sizeof(struct gfs2_bitmap), GFP_NOFS); + rgd->rd_bits = kzalloc(length * sizeof(struct gfs2_bitmap), GFP_NOFS); if (!rgd->rd_bits) return -ENOMEM; @@ -1451,7 +1451,7 @@ if (rlist->rl_rgrps == rlist->rl_space) { new_space = rlist->rl_space + 10; - tmp = kcalloc(new_space, sizeof(struct gfs2_rgrpd *), + tmp = kzalloc(new_space * sizeof(struct gfs2_rgrpd *), GFP_NOFS | __GFP_NOFAIL); if (rlist->rl_rgd) { @@ -1483,7 +1483,7 @@ { unsigned int x; - rlist->rl_ghs = kcalloc(rlist->rl_rgrps, sizeof(struct gfs2_holder), + rlist->rl_ghs = kzalloc(rlist->rl_rgrps * sizeof(struct gfs2_holder), GFP_NOFS | __GFP_NOFAIL); for (x = 0; x < rlist->rl_rgrps; x++) gfs2_holder_init(rlist->rl_rgd[x]->rd_gl, Index: linux-2.6.19-rc6-mm2/fs/nfsd/nfsctl.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/nfsd/nfsctl.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/nfsd/nfsctl.c 2006-11-29 19:37:18.000000000 -0800 @@ -395,7 +395,7 @@ return strlen(buf); } - nthreads = kcalloc(npools, sizeof(int), GFP_KERNEL); + nthreads = kzalloc(npools * sizeof(int), GFP_KERNEL); if (nthreads == NULL) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/fs/aio.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/aio.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/aio.c 2006-11-29 19:37:18.000000000 -0800 @@ -123,7 +123,7 @@ info->nr = 0; info->ring_pages = info->internal_pages; if (nr_pages > AIO_RING_PAGES) { - info->ring_pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL); + info->ring_pages = kzalloc(nr_pages * sizeof(struct page *), GFP_KERNEL); if (!info->ring_pages) return -ENOMEM; } Index: linux-2.6.19-rc6-mm2/fs/bio.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/bio.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/bio.c 2006-11-29 19:37:18.000000000 -0800 @@ -637,7 +637,7 @@ return ERR_PTR(-ENOMEM); ret = -ENOMEM; - pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL); + pages = kzalloc(nr_pages * sizeof(struct page *), GFP_KERNEL); if (!pages) goto out; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmrecovery.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmrecovery.c 2006-11-29 19:37:18.000000000 -0800 @@ -756,7 +756,7 @@ } BUG_ON(num == dead_node); - ndata = kcalloc(1, sizeof(*ndata), GFP_NOFS); + ndata = kzalloc(sizeof(*ndata), GFP_NOFS); if (!ndata) { dlm_destroy_recovery_area(dlm, dead_node); return -ENOMEM; @@ -841,7 +841,7 @@ } BUG_ON(lr->dead_node != dlm->reco.dead_node); - item = kcalloc(1, sizeof(*item), GFP_NOFS); + item = kzalloc(sizeof(*item), GFP_NOFS); if (!item) { dlm_put(dlm); return -ENOMEM; @@ -1322,7 +1322,7 @@ ret = -ENOMEM; buf = kmalloc(be16_to_cpu(msg->data_len), GFP_NOFS); - item = kcalloc(1, sizeof(*item), GFP_NOFS); + item = kzalloc(sizeof(*item), GFP_NOFS); if (!buf || !item) goto leave; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmmaster.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/dlm/dlmmaster.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmmaster.c 2006-11-29 19:37:18.000000000 -0800 @@ -1939,7 +1939,7 @@ int ignore_higher, u8 request_from, u32 flags) { struct dlm_work_item *item; - item = kcalloc(1, sizeof(*item), GFP_NOFS); + item = kzalloc(sizeof(*item), GFP_NOFS); if (!item) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmdomain.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/dlm/dlmdomain.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmdomain.c 2006-11-29 19:37:18.000000000 -0800 @@ -919,7 +919,7 @@ mlog_entry("%p", dlm); - ctxt = kcalloc(1, sizeof(*ctxt), GFP_KERNEL); + ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); if (!ctxt) { status = -ENOMEM; mlog_errno(status); @@ -1222,7 +1222,7 @@ int i; struct dlm_ctxt *dlm = NULL; - dlm = kcalloc(1, sizeof(*dlm), GFP_KERNEL); + dlm = kzalloc(sizeof(*dlm), GFP_KERNEL); if (!dlm) { mlog_errno(-ENOMEM); goto leave; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmlock.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/dlm/dlmlock.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/dlm/dlmlock.c 2006-11-29 19:37:18.000000000 -0800 @@ -408,13 +408,13 @@ struct dlm_lock *lock; int kernel_allocated = 0; - lock = kcalloc(1, sizeof(*lock), GFP_NOFS); + lock = kzalloc(sizeof(*lock), GFP_NOFS); if (!lock) return NULL; if (!lksb) { /* zero memory only if kernel-allocated */ - lksb = kcalloc(1, sizeof(*lksb), GFP_NOFS); + lksb = kzalloc(sizeof(*lksb), GFP_NOFS); if (!lksb) { kfree(lock); return NULL; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/cluster/nodemanager.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/cluster/nodemanager.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/cluster/nodemanager.c 2006-11-29 19:37:18.000000000 -0800 @@ -552,7 +552,7 @@ if (strlen(name) > O2NM_MAX_NAME_LEN) goto out; /* ENAMETOOLONG */ - node = kcalloc(1, sizeof(struct o2nm_node), GFP_KERNEL); + node = kzalloc(sizeof(struct o2nm_node), GFP_KERNEL); if (node == NULL) goto out; /* ENOMEM */ @@ -660,9 +660,9 @@ if (o2nm_single_cluster) goto out; /* ENOSPC */ - cluster = kcalloc(1, sizeof(struct o2nm_cluster), GFP_KERNEL); - ns = kcalloc(1, sizeof(struct o2nm_node_group), GFP_KERNEL); - defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL); + cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL); + ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL); + defs = kzalloc(3 * sizeof(struct config_group *), GFP_KERNEL); o2hb_group = o2hb_alloc_hb_set(); if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL) goto out; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/cluster/tcp.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/cluster/tcp.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/cluster/tcp.c 2006-11-29 19:37:18.000000000 -0800 @@ -300,7 +300,7 @@ struct page *page = NULL; page = alloc_page(GFP_NOFS); - sc = kcalloc(1, sizeof(*sc), GFP_NOFS); + sc = kzalloc(sizeof(*sc), GFP_NOFS); if (sc == NULL || page == NULL) goto out; @@ -676,7 +676,7 @@ goto out; } - nmh = kcalloc(1, sizeof(struct o2net_msg_handler), GFP_NOFS); + nmh = kzalloc(sizeof(struct o2net_msg_handler), GFP_NOFS); if (nmh == NULL) { ret = -ENOMEM; goto out; @@ -1799,9 +1799,9 @@ o2quo_init(); - o2net_hand = kcalloc(1, sizeof(struct o2net_handshake), GFP_KERNEL); - o2net_keep_req = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL); - o2net_keep_resp = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL); + o2net_hand = kzalloc( sizeof(struct o2net_handshake), GFP_KERNEL); + o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); + o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) { kfree(o2net_hand); kfree(o2net_keep_req); Index: linux-2.6.19-rc6-mm2/fs/ocfs2/cluster/heartbeat.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/cluster/heartbeat.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/cluster/heartbeat.c 2006-11-29 19:37:18.000000000 -0800 @@ -364,7 +364,7 @@ o2hb_compute_request_limits(reg, max_slots, &num_bios, &slots_per_bio); - bios = kcalloc(num_bios, sizeof(struct bio *), GFP_KERNEL); + bios = kzalloc(num_bios * sizeof(struct bio *), GFP_KERNEL); if (!bios) { status = -ENOMEM; mlog_errno(status); @@ -1234,7 +1234,7 @@ return -ENOMEM; } - reg->hr_slots = kcalloc(reg->hr_blocks, + reg->hr_slots = kzalloc(reg->hr_blocks * sizeof(struct o2hb_disk_slot), GFP_KERNEL); if (reg->hr_slots == NULL) { mlog_errno(-ENOMEM); @@ -1253,7 +1253,7 @@ "at %u blocks per page\n", reg->hr_num_pages, reg->hr_blocks, spp); - reg->hr_slot_data = kcalloc(reg->hr_num_pages, sizeof(struct page *), + reg->hr_slot_data = kzalloc(reg->hr_num_pages * sizeof(struct page *), GFP_KERNEL); if (!reg->hr_slot_data) { mlog_errno(-ENOMEM); @@ -1551,7 +1551,7 @@ struct o2hb_region *reg = NULL; struct config_item *ret = NULL; - reg = kcalloc(1, sizeof(struct o2hb_region), GFP_KERNEL); + reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL); if (reg == NULL) goto out; /* ENOMEM */ @@ -1677,7 +1677,7 @@ struct o2hb_heartbeat_group *hs = NULL; struct config_group *ret = NULL; - hs = kcalloc(1, sizeof(struct o2hb_heartbeat_group), GFP_KERNEL); + hs = kzalloc(sizeof(struct o2hb_heartbeat_group), GFP_KERNEL); if (hs == NULL) goto out; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/suballoc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/suballoc.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/suballoc.c 2006-11-29 19:37:18.000000000 -0800 @@ -488,7 +488,7 @@ int status; u32 slot; - *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); + *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL); if (!(*ac)) { status = -ENOMEM; mlog_errno(status); @@ -530,7 +530,7 @@ { int status; - *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); + *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL); if (!(*ac)) { status = -ENOMEM; mlog_errno(status); @@ -595,7 +595,7 @@ mlog_entry_void(); - *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); + *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL); if (!(*ac)) { status = -ENOMEM; mlog_errno(status); Index: linux-2.6.19-rc6-mm2/fs/ocfs2/slot_map.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/slot_map.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/slot_map.c 2006-11-29 19:37:18.000000000 -0800 @@ -175,7 +175,7 @@ struct buffer_head *bh = NULL; struct ocfs2_slot_info *si; - si = kcalloc(1, sizeof(struct ocfs2_slot_info), GFP_KERNEL); + si = kzalloc(sizeof(struct ocfs2_slot_info), GFP_KERNEL); if (!si) { status = -ENOMEM; mlog_errno(status); Index: linux-2.6.19-rc6-mm2/fs/ocfs2/namei.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/namei.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/namei.c 2006-11-29 19:37:18.000000000 -0800 @@ -1506,7 +1506,7 @@ goto bail; } - bhs = kcalloc(blocks, sizeof(struct buffer_head *), GFP_KERNEL); + bhs = kzalloc(blocks * sizeof(struct buffer_head *), GFP_KERNEL); if (!bhs) { status = -ENOMEM; mlog_errno(status); Index: linux-2.6.19-rc6-mm2/fs/ocfs2/super.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/super.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/super.c 2006-11-29 19:37:18.000000000 -0800 @@ -1194,7 +1194,7 @@ BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN); - osb->uuid_str = kcalloc(1, OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL); + osb->uuid_str = kzalloc(OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL); if (osb->uuid_str == NULL) return -ENOMEM; @@ -1225,7 +1225,7 @@ mlog_entry_void(); - osb = kcalloc(1, sizeof(struct ocfs2_super), GFP_KERNEL); + osb = kzalloc(sizeof(struct ocfs2_super), GFP_KERNEL); if (!osb) { status = -ENOMEM; mlog_errno(status); @@ -1309,7 +1309,7 @@ mlog(0, "max_slots for this device: %u\n", osb->max_slots); init_waitqueue_head(&osb->osb_wipe_event); - osb->osb_orphan_wipes = kcalloc(osb->max_slots, + osb->osb_orphan_wipes = kzalloc(osb->max_slots, sizeof(*osb->osb_orphan_wipes), GFP_KERNEL); if (!osb->osb_orphan_wipes) { @@ -1350,7 +1350,7 @@ */ /* initialize our journal structure */ - journal = kcalloc(1, sizeof(struct ocfs2_journal), GFP_KERNEL); + journal = kzalloc(sizeof(struct ocfs2_journal), GFP_KERNEL); if (!journal) { mlog(ML_ERROR, "unable to alloc journal\n"); status = -ENOMEM; Index: linux-2.6.19-rc6-mm2/fs/ocfs2/localalloc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/localalloc.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/localalloc.c 2006-11-29 19:37:18.000000000 -0800 @@ -776,7 +776,7 @@ { int status; - *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL); + *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL); if (!(*ac)) { status = -ENOMEM; mlog_errno(status); Index: linux-2.6.19-rc6-mm2/fs/ocfs2/vote.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/vote.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/vote.c 2006-11-29 19:37:18.000000000 -0800 @@ -479,7 +479,7 @@ { struct ocfs2_net_wait_ctxt *w; - w = kcalloc(1, sizeof(*w), GFP_NOFS); + w = kzalloc(sizeof(*w), GFP_NOFS); if (!w) { mlog_errno(-ENOMEM); goto bail; @@ -642,7 +642,7 @@ BUG_ON(!ocfs2_is_valid_vote_request(type)); - request = kcalloc(1, sizeof(*request), GFP_NOFS); + request = kzalloc(sizeof(*request), GFP_NOFS); if (!request) { mlog_errno(-ENOMEM); } else { Index: linux-2.6.19-rc6-mm2/fs/ocfs2/alloc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/fs/ocfs2/alloc.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/fs/ocfs2/alloc.c 2006-11-29 19:37:18.000000000 -0800 @@ -287,7 +287,7 @@ new_blocks = le16_to_cpu(el->l_tree_depth); /* allocate the number of new eb blocks we need */ - new_eb_bhs = kcalloc(new_blocks, sizeof(struct buffer_head *), + new_eb_bhs = kzalloc(new_blocks * sizeof(struct buffer_head *), GFP_KERNEL); if (!new_eb_bhs) { status = -ENOMEM; @@ -553,7 +553,7 @@ * for this part of the tree in an array and reserve a * journal write to them before making any changes. */ num_bhs = le16_to_cpu(fe->id2.i_list.l_tree_depth); - eb_bhs = kcalloc(num_bhs, sizeof(struct buffer_head *), + eb_bhs = kzalloc(num_bhs * sizeof(struct buffer_head *), GFP_KERNEL); if (!eb_bhs) { status = -ENOMEM; @@ -1956,7 +1956,7 @@ goto bail; } - *tc = kcalloc(1, sizeof(struct ocfs2_truncate_context), GFP_KERNEL); + *tc = kzalloc(sizeof(struct ocfs2_truncate_context), GFP_KERNEL); if (!(*tc)) { status = -ENOMEM; mlog_errno(status); Index: linux-2.6.19-rc6-mm2/include/linux/slab.h =================================================================== --- linux-2.6.19-rc6-mm2.orig/include/linux/slab.h 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/include/linux/slab.h 2006-11-29 19:37:18.000000000 -0800 @@ -201,19 +201,6 @@ return kzalloc(n * size, flags); } -/** - * kcalloc - allocate memory for an array. The memory is set to zero. - * @n: number of elements. - * @size: element size. - * @flags: the type of memory to allocate. - */ -static inline void *kcalloc(size_t n, size_t size, gfp_t flags) -{ - if (n != 0 && size > ULONG_MAX / n) - return NULL; - return kzalloc(n * size, flags); -} - extern void kfree(const void *); extern unsigned int ksize(const void *); extern int slab_is_available(void); @@ -308,11 +295,6 @@ return __kzalloc(n * size, flags); } -static inline void *kcalloc(size_t n, size_t size, gfp_t flags) -{ - return __kzalloc(n * size, flags); -} - #define kmem_cache_shrink(d) (0) #define kmem_cache_reap(a) #define kmem_ptr_validate(a, b) (0) Index: linux-2.6.19-rc6-mm2/include/linux/gameport.h =================================================================== --- linux-2.6.19-rc6-mm2.orig/include/linux/gameport.h 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/include/linux/gameport.h 2006-11-29 19:37:18.000000000 -0800 @@ -105,7 +105,7 @@ static inline struct gameport *gameport_allocate_port(void) { - struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL); + struct gameport *gameport = kzalloc(sizeof(struct gameport), GFP_KERNEL); return gameport; } Index: linux-2.6.19-rc6-mm2/kernel/relay.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/kernel/relay.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/kernel/relay.c 2006-11-29 19:37:18.000000000 -0800 @@ -106,7 +106,7 @@ *size = PAGE_ALIGN(*size); n_pages = *size >> PAGE_SHIFT; - buf->page_array = kcalloc(n_pages, sizeof(struct page *), GFP_KERNEL); + buf->page_array = kzalloc(n_pages * sizeof(struct page *), GFP_KERNEL); if (!buf->page_array) return NULL; @@ -138,7 +138,7 @@ */ struct rchan_buf *relay_create_buf(struct rchan *chan) { - struct rchan_buf *buf = kcalloc(1, sizeof(struct rchan_buf), GFP_KERNEL); + struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL); if (!buf) return NULL; @@ -478,7 +478,7 @@ if (!(subbuf_size && n_subbufs)) return NULL; - chan = kcalloc(1, sizeof(struct rchan), GFP_KERNEL); + chan = kzalloc(sizeof(struct rchan), GFP_KERNEL); if (!chan) return NULL; Index: linux-2.6.19-rc6-mm2/net/ipv4/cipso_ipv4.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/ipv4/cipso_ipv4.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/ipv4/cipso_ipv4.c 2006-11-29 19:37:18.000000000 -0800 @@ -232,7 +232,7 @@ { u32 iter; - cipso_v4_cache = kcalloc(CIPSO_V4_CACHE_BUCKETS, + cipso_v4_cache = kzalloc(CIPSO_V4_CACHE_BUCKETS * sizeof(struct cipso_v4_map_cache_bkt), GFP_KERNEL); if (cipso_v4_cache == NULL) Index: linux-2.6.19-rc6-mm2/net/ipv4/fib_trie.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/ipv4/fib_trie.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/ipv4/fib_trie.c 2006-11-29 19:37:18.000000000 -0800 @@ -328,7 +328,7 @@ struct page *pages; if (size <= PAGE_SIZE) - return kcalloc(size, 1, GFP_KERNEL); + return kzalloc(size, GFP_KERNEL); pages = alloc_pages(GFP_KERNEL|__GFP_ZERO, get_order(size)); if (!pages) Index: linux-2.6.19-rc6-mm2/net/tipc/net.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/tipc/net.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/tipc/net.c 2006-11-29 19:37:18.000000000 -0800 @@ -161,7 +161,7 @@ static int net_init(void) { memset(&tipc_net, 0, sizeof(tipc_net)); - tipc_net.zones = kcalloc(tipc_max_zones + 1, sizeof(struct _zone *), GFP_ATOMIC); + tipc_net.zones = kzalloc((tipc_max_zones + 1) * sizeof(struct _zone *), GFP_ATOMIC); if (!tipc_net.zones) { return -ENOMEM; } Index: linux-2.6.19-rc6-mm2/net/tipc/bearer.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/tipc/bearer.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/tipc/bearer.c 2006-11-29 19:37:18.000000000 -0800 @@ -665,8 +665,8 @@ int res; write_lock_bh(&tipc_net_lock); - tipc_bearers = kcalloc(MAX_BEARERS, sizeof(struct bearer), GFP_ATOMIC); - media_list = kcalloc(MAX_MEDIA, sizeof(struct media), GFP_ATOMIC); + tipc_bearers = kzalloc(MAX_BEARERS * sizeof(struct bearer), GFP_ATOMIC); + media_list = kzalloc(MAX_MEDIA * sizeof(struct media), GFP_ATOMIC); if (tipc_bearers && media_list) { res = TIPC_OK; } else { Index: linux-2.6.19-rc6-mm2/net/tipc/cluster.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/tipc/cluster.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/tipc/cluster.c 2006-11-29 19:37:18.000000000 -0800 @@ -70,7 +70,7 @@ else max_nodes = tipc_max_nodes + 1; - c_ptr->nodes = kcalloc(max_nodes + 1, sizeof(void*), GFP_ATOMIC); + c_ptr->nodes = kzalloc((max_nodes + 1) * sizeof(void*), GFP_ATOMIC); if (c_ptr->nodes == NULL) { warn("Cluster creation failure, no memory for node area\n"); kfree(c_ptr); Index: linux-2.6.19-rc6-mm2/net/tipc/name_table.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/tipc/name_table.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/tipc/name_table.c 2006-11-29 19:37:18.000000000 -0800 @@ -142,7 +142,7 @@ static struct sub_seq *tipc_subseq_alloc(u32 cnt) { - struct sub_seq *sseq = kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC); + struct sub_seq *sseq = kzalloc(cnt * sizeof(struct sub_seq), GFP_ATOMIC); return sseq; } Index: linux-2.6.19-rc6-mm2/net/sched/cls_tcindex.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/sched/cls_tcindex.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/sched/cls_tcindex.c 2006-11-29 19:37:18.000000000 -0800 @@ -295,12 +295,12 @@ err = -ENOMEM; if (!cp.perfect && !cp.h) { if (valid_perfect_hash(&cp)) { - cp.perfect = kcalloc(cp.hash, sizeof(*r), GFP_KERNEL); + cp.perfect = kzalloc(cp.hash * sizeof(*r), GFP_KERNEL); if (!cp.perfect) goto errout; balloc = 1; } else { - cp.h = kcalloc(cp.hash, sizeof(f), GFP_KERNEL); + cp.h = kzalloc(cp.hash * sizeof(f), GFP_KERNEL); if (!cp.h) goto errout; balloc = 2; Index: linux-2.6.19-rc6-mm2/net/bridge/br_ioctl.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/bridge/br_ioctl.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/bridge/br_ioctl.c 2006-11-29 19:37:18.000000000 -0800 @@ -162,7 +162,7 @@ if (num > BR_MAX_PORTS) num = BR_MAX_PORTS; - indices = kcalloc(num, sizeof(int), GFP_KERNEL); + indices = kzalloc(num * sizeof(int), GFP_KERNEL); if (indices == NULL) return -ENOMEM; @@ -325,7 +325,7 @@ if (args[2] >= 2048) return -ENOMEM; - indices = kcalloc(args[2], sizeof(int), GFP_KERNEL); + indices = kzalloc(args[2] * sizeof(int), GFP_KERNEL); if (indices == NULL) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/net/bridge/br_if.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/bridge/br_if.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/bridge/br_if.c 2006-11-29 19:37:18.000000000 -0800 @@ -238,7 +238,7 @@ struct net_bridge_port *p; unsigned long *inuse; - inuse = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long), + inuse = kzalloc(BITS_TO_LONGS(BR_MAX_PORTS) * sizeof(unsigned long), GFP_KERNEL); if (!inuse) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/net/decnet/dn_table.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/decnet/dn_table.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/decnet/dn_table.c 2006-11-29 19:37:18.000000000 -0800 @@ -159,7 +159,7 @@ break; } - ht = kcalloc(new_divisor, sizeof(struct dn_fib_node*), GFP_KERNEL); + ht = kzalloc(new_divisor * sizeof(struct dn_fib_node*), GFP_KERNEL); if (ht == NULL) return; @@ -195,7 +195,7 @@ dz->dz_hashmask = 0; } - dz->dz_hash = kcalloc(dz->dz_divisor, sizeof(struct dn_fib_node *), GFP_KERNEL); + dz->dz_hash = kzalloc(dz->dz_divisor * sizeof(struct dn_fib_node *), GFP_KERNEL); if (!dz->dz_hash) { kfree(dz); return NULL; Index: linux-2.6.19-rc6-mm2/net/netlink/af_netlink.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/netlink/af_netlink.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/netlink/af_netlink.c 2006-11-29 19:37:18.000000000 -0800 @@ -1774,7 +1774,7 @@ BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb)); - nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL); + nl_table = kzalloc(MAX_LINKS * sizeof(*nl_table), GFP_KERNEL); if (!nl_table) goto panic; Index: linux-2.6.19-rc6-mm2/net/netlabel/netlabel_cipso_v4.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/netlabel/netlabel_cipso_v4.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/netlabel/netlabel_cipso_v4.c 2006-11-29 19:37:18.000000000 -0800 @@ -209,14 +209,14 @@ if (doi_def->map.std->lvl.local_size > CIPSO_V4_MAX_LOC_LVLS || doi_def->map.std->lvl.cipso_size > CIPSO_V4_MAX_REM_LVLS) goto add_std_failure; - doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size, + doi_def->map.std->lvl.local = kzalloc(doi_def->map.std->lvl.local_size * sizeof(u32), GFP_KERNEL); if (doi_def->map.std->lvl.local == NULL) { ret_val = -ENOMEM; goto add_std_failure; } - doi_def->map.std->lvl.cipso = kcalloc(doi_def->map.std->lvl.cipso_size, + doi_def->map.std->lvl.cipso = kzalloc(doi_def->map.std->lvl.cipso_size * sizeof(u32), GFP_KERNEL); if (doi_def->map.std->lvl.cipso == NULL) { @@ -280,7 +280,7 @@ if (doi_def->map.std->cat.local_size > CIPSO_V4_MAX_LOC_CATS || doi_def->map.std->cat.cipso_size > CIPSO_V4_MAX_REM_CATS) goto add_std_failure; - doi_def->map.std->cat.local = kcalloc( + doi_def->map.std->cat.local = kzalloc(xxxx doi_def->map.std->cat.local_size, sizeof(u32), GFP_KERNEL); @@ -288,7 +288,7 @@ ret_val = -ENOMEM; goto add_std_failure; } - doi_def->map.std->cat.cipso = kcalloc( + doi_def->map.std->cat.cipso = kzalloc(xxx doi_def->map.std->cat.cipso_size, sizeof(u32), GFP_KERNEL); Index: linux-2.6.19-rc6-mm2/net/netlabel/netlabel_domainhash.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/netlabel/netlabel_domainhash.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/netlabel/netlabel_domainhash.c 2006-11-29 19:37:18.000000000 -0800 @@ -166,7 +166,7 @@ if (hsh_tbl == NULL) return -ENOMEM; hsh_tbl->size = 1 << size; - hsh_tbl->tbl = kcalloc(hsh_tbl->size, + hsh_tbl->tbl = kzalloc(hsh_tbl->size * sizeof(struct list_head), GFP_KERNEL); if (hsh_tbl->tbl == NULL) { Index: linux-2.6.19-rc6-mm2/net/sunrpc/svc.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/sunrpc/svc.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/sunrpc/svc.c 2006-11-29 19:37:18.000000000 -0800 @@ -94,10 +94,10 @@ static int svc_pool_map_alloc_arrays(struct svc_pool_map *m, unsigned int maxpools) { - m->to_pool = kcalloc(maxpools, sizeof(unsigned int), GFP_KERNEL); + m->to_pool = kzalloc(maxpools * sizeof(unsigned int), GFP_KERNEL); if (!m->to_pool) goto fail; - m->pool_to = kcalloc(maxpools, sizeof(unsigned int), GFP_KERNEL); + m->pool_to = kzalloc(maxpools * sizeof(unsigned int), GFP_KERNEL); if (!m->pool_to) goto fail_free; @@ -308,7 +308,7 @@ serv->sv_nrpools = npools; serv->sv_pools = - kcalloc(sizeof(struct svc_pool), serv->sv_nrpools, + kzalloc(sizeof(struct svc_pool) * serv->sv_nrpools, GFP_KERNEL); if (!serv->sv_pools) { kfree(serv); Index: linux-2.6.19-rc6-mm2/net/sunrpc/stats.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/net/sunrpc/stats.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/net/sunrpc/stats.c 2006-11-29 19:37:18.000000000 -0800 @@ -115,7 +115,7 @@ struct rpc_iostats *rpc_alloc_iostats(struct rpc_clnt *clnt) { struct rpc_iostats *new; - new = kcalloc(clnt->cl_maxproc, sizeof(struct rpc_iostats), GFP_KERNEL); + new = kzalloc(clnt->cl_maxproc * sizeof(struct rpc_iostats), GFP_KERNEL); return new; } EXPORT_SYMBOL(rpc_alloc_iostats); Index: linux-2.6.19-rc6-mm2/security/selinux/ss/services.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/security/selinux/ss/services.c 2006-11-29 19:36:06.000000000 -0800 +++ linux-2.6.19-rc6-mm2/security/selinux/ss/services.c 2006-11-29 19:37:18.000000000 -0800 @@ -1595,7 +1595,7 @@ } usercon.user = user->value; - mysids = kcalloc(maxnel, sizeof(*mysids), GFP_ATOMIC); + mysids = kzalloc(maxnel * sizeof(*mysids), GFP_ATOMIC); if (!mysids) { rc = -ENOMEM; goto out_unlock; @@ -1629,7 +1629,7 @@ mysids[mynel++] = sid; } else { maxnel += SIDS_NEL; - mysids2 = kcalloc(maxnel, sizeof(*mysids2), GFP_ATOMIC); + mysids2 = kzalloc(maxnel * sizeof(*mysids2), GFP_ATOMIC); if (!mysids2) { rc = -ENOMEM; kfree(mysids); @@ -1776,11 +1776,11 @@ goto out; } - *names = kcalloc(*len, sizeof(char*), GFP_ATOMIC); + *names = kzalloc(*len * sizeof(char*), GFP_ATOMIC); if (!*names) goto err; - *values = kcalloc(*len, sizeof(int), GFP_ATOMIC); + *values = kzalloc(*len * sizeof(int), GFP_ATOMIC); if (!*values) goto err; Index: linux-2.6.19-rc6-mm2/sound/pci/hda/hda_intel.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/hda/hda_intel.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/hda/hda_intel.c 2006-11-29 19:37:18.000000000 -0800 @@ -1597,7 +1597,7 @@ break; } chip->num_streams = chip->playback_streams + chip->capture_streams; - chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), GFP_KERNEL); + chip->azx_dev = kzalloc(chip->num_streams * sizeof(*chip->azx_dev), GFP_KERNEL); if (!chip->azx_dev) { snd_printk(KERN_ERR "cannot malloc azx_dev\n"); goto errout; Index: linux-2.6.19-rc6-mm2/sound/pci/hda/hda_codec.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/hda/hda_codec.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/hda/hda_codec.c 2006-11-29 19:37:18.000000000 -0800 @@ -665,7 +665,7 @@ if (codec->num_amp_entries >= codec->amp_info_size) { /* reallocate the array */ int new_size = codec->amp_info_size + 64; - struct hda_amp_info *new_info = kcalloc(new_size, sizeof(struct hda_amp_info), + struct hda_amp_info *new_info = kzalloc(new_size * sizeof(struct hda_amp_info), GFP_KERNEL); if (! new_info) { snd_printk(KERN_ERR "hda_codec: can't malloc amp_info\n"); Index: linux-2.6.19-rc6-mm2/sound/pci/hda/patch_analog.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/hda/patch_analog.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/hda/patch_analog.c 2006-11-29 19:37:18.000000000 -0800 @@ -2185,7 +2185,7 @@ if (spec->num_kctl_used >= spec->num_kctl_alloc) { int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; - knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */ + knew = kzalloc((num + 1) * sizeof(*knew), GFP_KERNEL); /* array + terminator */ if (! knew) return -ENOMEM; if (spec->kctl_alloc) { Index: linux-2.6.19-rc6-mm2/sound/pci/hda/patch_sigmatel.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/hda/patch_sigmatel.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/hda/patch_sigmatel.c 2006-11-29 19:37:18.000000000 -0800 @@ -604,7 +604,7 @@ struct sigmatel_spec *spec = codec->spec; if (! spec->bios_pin_configs) { - spec->bios_pin_configs = kcalloc(spec->num_pins, + spec->bios_pin_configs = kzalloc(spec->num_pins * sizeof(*spec->bios_pin_configs), GFP_KERNEL); if (! spec->bios_pin_configs) return -ENOMEM; @@ -911,7 +911,7 @@ if (spec->num_kctl_used >= spec->num_kctl_alloc) { int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; - knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */ + knew = kzalloc((num + 1) * sizeof(*knew), GFP_KERNEL); /* array + terminator */ if (! knew) return -ENOMEM; if (spec->kctl_alloc) { Index: linux-2.6.19-rc6-mm2/sound/pci/hda/patch_realtek.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/hda/patch_realtek.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/hda/patch_realtek.c 2006-11-29 19:37:18.000000000 -0800 @@ -2705,7 +2705,7 @@ if (spec->num_kctl_used >= spec->num_kctl_alloc) { int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; - knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */ + knew = kzalloc((num + 1) * sizeof(*knew), GFP_KERNEL); /* array + terminator */ if (! knew) return -ENOMEM; if (spec->kctl_alloc) { @@ -6465,7 +6465,7 @@ int board_config; int err; - spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); + spec = kzalloc(sizeof(*spec), GFP_KERNEL); if (spec == NULL) return -ENOMEM; @@ -7585,7 +7585,7 @@ int board_config; int err; - spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); + spec = kzalloc(sizeof(*spec), GFP_KERNEL); if (spec == NULL) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/pci/ac97/ac97_pcm.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/ac97/ac97_pcm.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/ac97/ac97_pcm.c 2006-11-29 19:37:18.000000000 -0800 @@ -456,7 +456,7 @@ unsigned int rates; struct snd_ac97 *codec; - rpcms = kcalloc(pcms_count, sizeof(struct ac97_pcm), GFP_KERNEL); + rpcms = kzalloc(pcms_count * sizeof(struct ac97_pcm), GFP_KERNEL); if (rpcms == NULL) return -ENOMEM; memset(avail_slots, 0, sizeof(avail_slots)); Index: linux-2.6.19-rc6-mm2/sound/pci/nm256/nm256.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/nm256/nm256.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/nm256/nm256.c 2006-11-29 19:37:18.000000000 -0800 @@ -1304,7 +1304,7 @@ .read = snd_nm256_ac97_read, }; - chip->ac97_regs = kcalloc(sizeof(short), + chip->ac97_regs = kzalloc(sizeof(short) * ARRAY_SIZE(nm256_ac97_init_val), GFP_KERNEL); if (! chip->ac97_regs) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/pci/emu10k1/emufx.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/emu10k1/emufx.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/emu10k1/emufx.c 2006-11-29 19:37:18.000000000 -0800 @@ -1108,9 +1108,9 @@ if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL || (icode->gpr_map = (u_int32_t __user *) - kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), + kzalloc((512 + 256 + 256 + 2 * 1024) * sizeof(u_int32_t), GFP_KERNEL)) == NULL || - (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, + (controls = kzalloc(SND_EMU10K1_GPR_CONTROLS * sizeof(*controls), GFP_KERNEL)) == NULL) { err = -ENOMEM; goto __err; @@ -1644,9 +1644,9 @@ if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL) return -ENOMEM; if ((icode->gpr_map = (u_int32_t __user *) - kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), + kzalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL || - (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, + (controls = kzalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(struct snd_emu10k1_fx8010_control_gpr), GFP_KERNEL)) == NULL || (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) { Index: linux-2.6.19-rc6-mm2/sound/pci/emu10k1/p16v.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/emu10k1/p16v.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/emu10k1/p16v.c 2006-11-29 19:37:18.000000000 -0800 @@ -183,7 +183,7 @@ int err; epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); - //snd_printk("epcm kcalloc: %p\n", epcm); + //snd_printk("epcm kzalloc: %p\n", epcm); if (epcm == NULL) return -ENOMEM; @@ -219,7 +219,7 @@ int err; epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); - //snd_printk("epcm kcalloc: %p\n", epcm); + //snd_printk("epcm kzalloc: %p\n", epcm); if (epcm == NULL) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/pci/maestro3.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/maestro3.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/maestro3.c 2006-11-29 19:37:18.000000000 -0800 @@ -2739,7 +2739,7 @@ chip->is_omnibook = 1; chip->num_substreams = NR_DSPS; - chip->substreams = kcalloc(chip->num_substreams, sizeof(struct m3_dma), + chip->substreams = kzalloc(chip->num_substreams * sizeof(struct m3_dma), GFP_KERNEL); if (chip->substreams == NULL) { kfree(chip); Index: linux-2.6.19-rc6-mm2/sound/pci/ice1712/revo.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/pci/ice1712/revo.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/pci/ice1712/revo.c 2006-11-29 19:37:18.000000000 -0800 @@ -504,7 +504,7 @@ } /* second stage of initialization, analog parts and others */ - ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL); + ak = ice->akm = kzalloc(2 * sizeof(struct snd_akm4xxx), GFP_KERNEL); if (! ak) return -ENOMEM; ice->akm_codecs = 2; Index: linux-2.6.19-rc6-mm2/sound/usb/usx2y/usbusx2yaudio.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/usb/usx2y/usbusx2yaudio.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/usb/usx2y/usbusx2yaudio.c 2006-11-29 19:37:18.000000000 -0800 @@ -433,7 +433,7 @@ return -EINVAL; if (is_playback && NULL == subs->tmpbuf) { /* allocate a temporary buffer for playback */ - subs->tmpbuf = kcalloc(nr_of_packs(), subs->maxpacksize, GFP_KERNEL); + subs->tmpbuf = kzalloc(nr_of_packs() * subs->maxpacksize, GFP_KERNEL); if (NULL == subs->tmpbuf) { snd_printk(KERN_ERR "cannot malloc tmpbuf\n"); return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/usb/usbmixer.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/usb/usbmixer.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/usb/usbmixer.c 2006-11-29 19:37:18.000000000 -0800 @@ -2016,7 +2016,7 @@ #ifdef IGNORE_CTL_ERROR mixer->ignore_ctl_error = 1; #endif - mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL); + mixer->id_elems = kzalloc(256 * sizeof(*mixer->id_elems), GFP_KERNEL); if (!mixer->id_elems) { kfree(mixer); return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/usb/usbaudio.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/usb/usbaudio.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/usb/usbaudio.c 2006-11-29 19:37:18.000000000 -0800 @@ -1745,8 +1745,8 @@ struct list_head *p; int err = 1; - channels = kcalloc(MAX_MASK, sizeof(u32), GFP_KERNEL); - rates = kcalloc(MAX_MASK, sizeof(u32), GFP_KERNEL); + channels = kzalloc(MAX_MASK * sizeof(u32), GFP_KERNEL); + rates = kzalloc(MAX_MASK * sizeof(u32), GFP_KERNEL); list_for_each(p, &subs->fmt_list) { struct audioformat *f; Index: linux-2.6.19-rc6-mm2/sound/core/oss/pcm_plugin.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/oss/pcm_plugin.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/oss/pcm_plugin.c 2006-11-29 19:37:18.000000000 -0800 @@ -171,7 +171,7 @@ channels = src_format->channels; else channels = dst_format->channels; - plugin->buf_channels = kcalloc(channels, sizeof(*plugin->buf_channels), GFP_KERNEL); + plugin->buf_channels = kzalloc(channels * sizeof(*plugin->buf_channels), GFP_KERNEL); if (plugin->buf_channels == NULL) { snd_pcm_plugin_free(plugin); return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/core/oss/mixer_oss.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/oss/mixer_oss.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/oss/mixer_oss.c 2006-11-29 19:37:18.000000000 -0800 @@ -1280,7 +1280,7 @@ char name[128]; int idx, err; - mixer = kcalloc(2, sizeof(*mixer), GFP_KERNEL); + mixer = kzalloc(2 * sizeof(*mixer), GFP_KERNEL); if (mixer == NULL) return -ENOMEM; mutex_init(&mixer->reg_mutex); Index: linux-2.6.19-rc6-mm2/sound/core/seq/oss/seq_oss_readq.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/seq/oss/seq_oss_readq.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/seq/oss/seq_oss_readq.c 2006-11-29 19:37:18.000000000 -0800 @@ -51,7 +51,7 @@ return NULL; } - if ((q->q = kcalloc(maxlen, sizeof(union evrec), GFP_KERNEL)) == NULL) { + if ((q->q = kzalloc(maxlen * sizeof(union evrec), GFP_KERNEL)) == NULL) { snd_printk(KERN_ERR "can't malloc read queue buffer\n"); kfree(q); return NULL; Index: linux-2.6.19-rc6-mm2/sound/core/seq/oss/seq_oss_synth.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/seq/oss/seq_oss_synth.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/seq/oss/seq_oss_synth.c 2006-11-29 19:37:18.000000000 -0800 @@ -244,7 +244,7 @@ } info->nr_voices = rec->nr_voices; if (info->nr_voices > 0) { - info->ch = kcalloc(info->nr_voices, sizeof(struct seq_oss_chinfo), GFP_KERNEL); + info->ch = kzalloc(info->nr_voices * sizeof(struct seq_oss_chinfo), GFP_KERNEL); if (!info->ch) BUG(); reset_channels(info); Index: linux-2.6.19-rc6-mm2/sound/core/seq/seq_midi.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/seq/seq_midi.c 2006-11-29 19:15:32.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/seq/seq_midi.c 2006-11-29 19:37:18.000000000 -0800 @@ -331,7 +331,7 @@ } } - msynth = kcalloc(ports, sizeof(struct seq_midisynth), GFP_KERNEL); + msynth = kzalloc(ports * sizeof(struct seq_midisynth), GFP_KERNEL); port = kmalloc(sizeof(*port), GFP_KERNEL); if (msynth == NULL || port == NULL) goto __nomem; Index: linux-2.6.19-rc6-mm2/sound/core/sgbuf.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/sgbuf.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/sgbuf.c 2006-11-29 19:37:18.000000000 -0800 @@ -74,10 +74,10 @@ sgbuf->dev = device; pages = snd_sgbuf_aligned_pages(size); sgbuf->tblsize = sgbuf_align_table(pages); - sgbuf->table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->table), GFP_KERNEL); + sgbuf->table = kzalloc(sgbuf->tblsize * sizeof(*sgbuf->table), GFP_KERNEL); if (! sgbuf->table) goto _failed; - sgbuf->page_table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->page_table), GFP_KERNEL); + sgbuf->page_table = kzalloc(sgbuf->tblsize * sizeof(*sgbuf->page_table), GFP_KERNEL); if (! sgbuf->page_table) goto _failed; Index: linux-2.6.19-rc6-mm2/sound/core/pcm_lib.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/core/pcm_lib.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/core/pcm_lib.c 2006-11-29 19:37:18.000000000 -0800 @@ -867,7 +867,7 @@ if (constrs->rules_num >= constrs->rules_all) { struct snd_pcm_hw_rule *new; unsigned int new_rules = constrs->rules_all + 16; - new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL); + new = kzalloc(new_rules * sizeof(*c), GFP_KERNEL); if (!new) return -ENOMEM; if (constrs->rules) { Index: linux-2.6.19-rc6-mm2/sound/synth/emux/emux.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/synth/emux/emux.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/synth/emux/emux.c 2006-11-29 19:37:18.000000000 -0800 @@ -102,7 +102,7 @@ emu->card = card; emu->name = kstrdup(name, GFP_KERNEL); - emu->voices = kcalloc(emu->max_voices, sizeof(struct snd_emux_voice), + emu->voices = kzalloc(emu->max_voices * sizeof(struct snd_emux_voice), GFP_KERNEL); if (emu->voices == NULL) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/synth/emux/emux_seq.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/synth/emux/emux_seq.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/synth/emux/emux_seq.c 2006-11-29 19:37:18.000000000 -0800 @@ -150,7 +150,7 @@ snd_printk("no memory\n"); return NULL; } - p->chset.channels = kcalloc(max_channels, sizeof(struct snd_midi_channel), GFP_KERNEL); + p->chset.channels = kzalloc(max_channels * sizeof(struct snd_midi_channel), GFP_KERNEL); if (p->chset.channels == NULL) { snd_printk("no memory\n"); kfree(p); @@ -352,7 +352,7 @@ if (emu->midi_ports <= 0) return 0; - emu->vmidi = kcalloc(emu->midi_ports, sizeof(struct snd_rawmidi *), GFP_KERNEL); + emu->vmidi = kzalloc(emu->midi_ports * sizeof(struct snd_rawmidi *), GFP_KERNEL); if (emu->vmidi == NULL) return -ENOMEM; Index: linux-2.6.19-rc6-mm2/sound/synth/emux/emux_effect.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/synth/emux/emux_effect.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/synth/emux/emux_effect.c 2006-11-29 19:37:18.000000000 -0800 @@ -280,7 +280,7 @@ snd_emux_create_effect(struct snd_emux_port *p) { int i; - p->effect = kcalloc(p->chset.max_channels, + p->effect = kzalloc(p->chset.max_channels * sizeof(struct snd_emux_effect_table), GFP_KERNEL); if (p->effect) { for (i = 0; i < p->chset.max_channels; i++) Index: linux-2.6.19-rc6-mm2/sound/drivers/vx/vx_pcm.c =================================================================== --- linux-2.6.19-rc6-mm2.orig/sound/drivers/vx/vx_pcm.c 2006-11-29 19:15:33.000000000 -0800 +++ linux-2.6.19-rc6-mm2/sound/drivers/vx/vx_pcm.c 2006-11-29 19:37:18.000000000 -0800 @@ -1252,10 +1252,10 @@ chip->audio_info = rmh.Stat[1]; /* allocate pipes */ - chip->playback_pipes = kcalloc(chip->audio_outs, sizeof(struct vx_pipe *), GFP_KERNEL); + chip->playback_pipes = kzalloc(chip->audio_outs * sizeof(struct vx_pipe *), GFP_KERNEL); if (!chip->playback_pipes) return -ENOMEM; - chip->capture_pipes = kcalloc(chip->audio_ins, sizeof(struct vx_pipe *), GFP_KERNEL); + chip->capture_pipes = kzalloc(chip->audio_ins * sizeof(struct vx_pipe *), GFP_KERNEL); if (!chip->capture_pipes) { kfree(chip->playback_pipes); return -ENOMEM;