Merge linux-2.6 with linux-acpi-2.6

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 4564ed0b5ff3..906622d9f933 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -431,7 +431,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev)
 {
         struct sysdata_el *element;
 
-        element = kcalloc(1, sizeof(struct sysdata_el), GFP_KERNEL);
+        element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL);
         if (!element) {
                 dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);
                 return;
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 254fe15c064b..b45db5133f55 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -191,7 +191,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num,
 {
         struct cx_dev *cx_dev;
 
-        cx_dev = kcalloc(1, sizeof(struct cx_dev), GFP_KERNEL);
+        cx_dev = kzalloc(sizeof(struct cx_dev), GFP_KERNEL);
         DBG("cx_dev= 0x%p\n", cx_dev);
         if (cx_dev == NULL)
                 return -ENOMEM;
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index ea09c12f0258..19bced34d5f1 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -148,7 +148,7 @@ tioca_gart_init(struct tioca_kernel *tioca_kern)
         tioca_kern->ca_pcigart_entries =
             tioca_kern->ca_pciap_size / tioca_kern->ca_ap_pagesize;
         tioca_kern->ca_pcigart_pagemap =
-            kcalloc(1, tioca_kern->ca_pcigart_entries / 8, GFP_KERNEL);
+            kzalloc(tioca_kern->ca_pcigart_entries / 8, GFP_KERNEL);
         if (!tioca_kern->ca_pcigart_pagemap) {
                 free_pages((unsigned long)tioca_kern->ca_gart,
                            get_order(tioca_kern->ca_gart_size));
@@ -392,7 +392,7 @@ tioca_dma_mapped(struct pci_dev *pdev, uint64_t paddr, size_t req_size)
          * allocate a map struct
          */
 
-        ca_dmamap = kcalloc(1, sizeof(struct tioca_dmamap), GFP_ATOMIC);
+        ca_dmamap = kzalloc(sizeof(struct tioca_dmamap), GFP_ATOMIC);
         if (!ca_dmamap)
                 goto map_return;
 
@@ -600,7 +600,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
          * Allocate kernel bus soft and copy from prom.
          */
 
-        tioca_common = kcalloc(1, sizeof(struct tioca_common), GFP_KERNEL);
+        tioca_common = kzalloc(sizeof(struct tioca_common), GFP_KERNEL);
         if (!tioca_common)
                 return NULL;
 
@@ -609,7 +609,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
 
         /* init kernel-private area */
 
-        tioca_kern = kcalloc(1, sizeof(struct tioca_kernel), GFP_KERNEL);
+        tioca_kern = kzalloc(sizeof(struct tioca_kernel), GFP_KERNEL);
         if (!tioca_kern) {
                 kfree(tioca_common);
                 return NULL;