4 files changed, 6 insertions, 13 deletions

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 14691cda05c3..ce49fe3a3b56 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1672,15 +1672,13 @@ ioc_sac_init(struct ioc *ioc)
          * SAC (single address cycle) addressable, so allocate a
          * pseudo-device to enforce that.
          */
-        sac = kmalloc(sizeof(*sac), GFP_KERNEL);
+        sac = kzalloc(sizeof(*sac), GFP_KERNEL);
         if (!sac)
                 panic(PFX "Couldn't allocate struct pci_dev");
-        memset(sac, 0, sizeof(*sac));
 
-        controller = kmalloc(sizeof(*controller), GFP_KERNEL);
+        controller = kzalloc(sizeof(*controller), GFP_KERNEL);
         if (!controller)
                 panic(PFX "Couldn't allocate struct pci_controller");
-        memset(controller, 0, sizeof(*controller));
 
         controller->iommu = ioc;
         sac->sysdata = controller;
@@ -1737,12 +1735,10 @@ ioc_init(u64 hpa, void *handle)
         struct ioc *ioc;
         struct ioc_iommu *info;
 
-        ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
+        ioc = kzalloc(sizeof(*ioc), GFP_KERNEL);
         if (!ioc)
                 return NULL;
 
-        memset(ioc, 0, sizeof(*ioc));
-
         ioc->next = ioc_list;
         ioc_list = ioc;
 
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index b62f0c4d2c7c..1f16ebb9a800 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -684,12 +684,11 @@ static int get_async_struct(int line, struct async_struct **ret_info)
                 *ret_info = sstate->info;
                 return 0;
         }
-        info = kmalloc(sizeof(struct async_struct), GFP_KERNEL);
+        info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);
         if (!info) {
                 sstate->count--;
                 return -ENOMEM;
         }
-        memset(info, 0, sizeof(struct async_struct));
         init_waitqueue_head(&info->open_wait);
         init_waitqueue_head(&info->close_wait);
         init_waitqueue_head(&info->delta_msr_wait);
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 3aaede0d6981..fa4a1a7eb67d 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -853,9 +853,8 @@ pfm_context_alloc(void)
          * allocate context descriptor 
          * must be able to free with interrupts disabled
          */
-        ctx = kmalloc(sizeof(pfm_context_t), GFP_KERNEL);
+        ctx = kzalloc(sizeof(pfm_context_t), GFP_KERNEL);
         if (ctx) {
-                memset(ctx, 0, sizeof(pfm_context_t));
                 DPRINT(("alloc ctx @%p\n", ctx));
         }
         return ctx;
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index eb92cef9cd0d..474d179966dc 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -125,11 +125,10 @@ alloc_pci_controller (int seg)
 {
         struct pci_controller *controller;
 
-        controller = kmalloc(sizeof(*controller), GFP_KERNEL);
+        controller = kzalloc(sizeof(*controller), GFP_KERNEL);
         if (!controller)
                 return NULL;
 
-        memset(controller, 0, sizeof(*controller));
         controller->segment = seg;
         controller->node = -1;
         return controller;