11 files changed, 27 insertions, 58 deletions

diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index 7991e919d8ab..c69504aa638f 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -277,10 +277,9 @@ static inline void *ebus_alloc(size_t size)
 {
         void *mem;
 
-        mem = kmalloc(size, GFP_ATOMIC);
+        mem = kzalloc(size, GFP_ATOMIC);
         if (!mem)
                 panic("ebus_alloc: out of memory");
-        memset((char *)mem, 0, size);
         return mem;
 }
 
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 712b16cdd5fb..8c93ba655b33 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -316,12 +316,11 @@ unsigned int build_irq(int pil, int inofixup, unsigned long iclr, unsigned long
                 goto out;
         }
 
-        bucket->irq_info = kmalloc(sizeof(struct irq_desc), GFP_ATOMIC);
+        bucket->irq_info = kzalloc(sizeof(struct irq_desc), GFP_ATOMIC);
         if (!bucket->irq_info) {
                 prom_printf("IRQ: Error, kmalloc(irq_desc) failed.\n");
                 prom_halt();
         }
-        memset(bucket->irq_info, 0, sizeof(struct irq_desc));
 
         /* Ok, looks good, set it up.  Don't touch the irq_chain or
          * the pending flag.
@@ -357,12 +356,11 @@ unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino, int pil, unsign
         bucket->pil = pil;
         bucket->flags = flags;
 
-        bucket->irq_info = kmalloc(sizeof(struct irq_desc), GFP_ATOMIC);
+        bucket->irq_info = kzalloc(sizeof(struct irq_desc), GFP_ATOMIC);
         if (!bucket->irq_info) {
                 prom_printf("IRQ: Error, kmalloc(irq_desc) failed.\n");
                 prom_halt();
         }
-        memset(bucket->irq_info, 0, sizeof(struct irq_desc));
 
         return __irq(bucket);
 }
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 1448294a2379..33dedb1aacd4 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -977,33 +977,30 @@ void pci_register_legacy_regions(struct resource *io_res,
         struct resource *p;
 
         /* VGA Video RAM. */
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p)
                 return;
 
-        memset(p, 0, sizeof(*p));
         p->name = "Video RAM area";
         p->start = mem_res->start + 0xa0000UL;
         p->end = p->start + 0x1ffffUL;
         p->flags = IORESOURCE_BUSY;
         request_resource(mem_res, p);
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p)
                 return;
 
-        memset(p, 0, sizeof(*p));
         p->name = "System ROM";
         p->start = mem_res->start + 0xf0000UL;
         p->end = p->start + 0xffffUL;
         p->flags = IORESOURCE_BUSY;
         request_resource(mem_res, p);
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p)
                 return;
 
-        memset(p, 0, sizeof(*p));
         p->name = "Video ROM";
         p->start = mem_res->start + 0xc0000UL;
         p->end = p->start + 0x7fffUL;
diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index c9320eac45d3..8efbc139769d 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -139,12 +139,11 @@ void pci_iommu_table_init(struct pci_iommu *iommu, int tsbsize, u32 dma_offset,
         /* Allocate and initialize the free area map.  */
         sz = num_tsb_entries / 8;
         sz = (sz + 7UL) & ~7UL;
-        iommu->arena.map = kmalloc(sz, GFP_KERNEL);
+        iommu->arena.map = kzalloc(sz, GFP_KERNEL);
         if (!iommu->arena.map) {
                 prom_printf("PCI_IOMMU: Error, kmalloc(arena.map) failed.\n");
                 prom_halt();
         }
-        memset(iommu->arena.map, 0, sz);
         iommu->arena.limit = num_tsb_entries;
 
         /* Allocate and initialize the dummy page which we
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index c03ed5f49d31..f7b16e49c28b 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1164,7 +1164,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
 static void pbm_scan_bus(struct pci_controller_info *p,
                          struct pci_pbm_info *pbm)
 {
-        struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL);
+        struct pcidev_cookie *cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
 
         if (!cookie) {
                 prom_printf("PSYCHO: Critical allocation failure.\n");
@@ -1172,7 +1172,6 @@ static void pbm_scan_bus(struct pci_controller_info *p,
         }
 
         /* All we care about is the PBM. */
-        memset(cookie, 0, sizeof(*cookie));
         cookie->pbm = pbm;
 
         pbm->pci_bus = pci_scan_bus(pbm->pci_first_busno,
@@ -1465,18 +1464,16 @@ void psycho_init(int node, char *model_name)
                 }
         }
 
-        p = kmalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
+        p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
         if (!p) {
                 prom_printf("PSYCHO: Fatal memory allocation error.\n");
                 prom_halt();
         }
-        memset(p, 0, sizeof(*p));
-        iommu = kmalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
+        iommu = kzalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
         if (!iommu) {
                 prom_printf("PSYCHO: Fatal memory allocation error.\n");
                 prom_halt();
         }
-        memset(iommu, 0, sizeof(*iommu));
         p->pbm_A.iommu = p->pbm_B.iommu = iommu;
 
         p->next = pci_controller_root;
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index da8e1364194f..5ddc92931976 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1167,7 +1167,7 @@ static void apb_init(struct pci_controller_info *p, struct pci_bus *sabre_bus)
 
 static struct pcidev_cookie *alloc_bridge_cookie(struct pci_pbm_info *pbm)
 {
-        struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL);
+        struct pcidev_cookie *cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
 
         if (!cookie) {
                 prom_printf("SABRE: Critical allocation failure.\n");
@@ -1175,7 +1175,6 @@ static struct pcidev_cookie *alloc_bridge_cookie(struct pci_pbm_info *pbm)
         }
 
         /* All we care about is the PBM. */
-        memset(cookie, 0, sizeof(*cookie));
         cookie->pbm = pbm;
 
         return cookie;
@@ -1556,19 +1555,17 @@ void sabre_init(int pnode, char *model_name)
                 }
         }
 
-        p = kmalloc(sizeof(*p), GFP_ATOMIC);
+        p = kzalloc(sizeof(*p), GFP_ATOMIC);
         if (!p) {
                 prom_printf("SABRE: Error, kmalloc(pci_controller_info) failed.\n");
                 prom_halt();
         }
-        memset(p, 0, sizeof(*p));
 
-        iommu = kmalloc(sizeof(*iommu), GFP_ATOMIC);
+        iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
         if (!iommu) {
                 prom_printf("SABRE: Error, kmalloc(pci_iommu) failed.\n");
                 prom_halt();
         }
-        memset(iommu, 0, sizeof(*iommu));
         p->pbm_A.iommu = p->pbm_B.iommu = iommu;
 
         upa_portid = prom_getintdefault(pnode, "upa-portid", 0xff);
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index d8c4e0919b4e..3a89f29e27d6 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1525,7 +1525,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
 static void pbm_scan_bus(struct pci_controller_info *p,
                          struct pci_pbm_info *pbm)
 {
-        struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL);
+        struct pcidev_cookie *cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
 
         if (!cookie) {
                 prom_printf("%s: Critical allocation failure.\n", pbm->name);
@@ -1533,7 +1533,6 @@ static void pbm_scan_bus(struct pci_controller_info *p,
         }
 
         /* All we care about is the PBM. */
-        memset(cookie, 0, sizeof(*cookie));
         cookie->pbm = pbm;
 
         pbm->pci_bus = pci_scan_bus(pbm->pci_first_busno,
@@ -2120,27 +2119,24 @@ static void __schizo_init(int node, char *model_name, int chip_type)
                 }
         }
 
-        p = kmalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
+        p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
         if (!p) {
                 prom_printf("SCHIZO: Fatal memory allocation error.\n");
                 prom_halt();
         }
-        memset(p, 0, sizeof(*p));
 
-        iommu = kmalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
+        iommu = kzalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
         if (!iommu) {
                 prom_printf("SCHIZO: Fatal memory allocation error.\n");
                 prom_halt();
         }
-        memset(iommu, 0, sizeof(*iommu));
         p->pbm_A.iommu = iommu;
 
-        iommu = kmalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
+        iommu = kzalloc(sizeof(struct pci_iommu), GFP_ATOMIC);
         if (!iommu) {
                 prom_printf("SCHIZO: Fatal memory allocation error.\n");
                 prom_halt();
         }
-        memset(iommu, 0, sizeof(*iommu));
         p->pbm_B.iommu = iommu;
 
         p->next = pci_controller_root;
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 0c68a76143af..2a2a8a6cd17d 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -536,15 +536,11 @@ static int __init topology_init(void)
         while (!cpu_find_by_instance(ncpus_probed, NULL, NULL))
                 ncpus_probed++;
 
-        for (i = 0; i < NR_CPUS; i++) {
-                if (cpu_possible(i)) {
-                        struct cpu *p = kmalloc(sizeof(*p), GFP_KERNEL);
-
-                        if (p) {
-                                memset(p, 0, sizeof(*p));
-                                register_cpu(p, i, NULL);
-                                err = 0;
-                        }
+        for_each_cpu(i) {
+                struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
+                if (p) {
+                        register_cpu(p, i, NULL);
+                        err = 0;
                 }
         }
 
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 095db723bb8a..8840415408be 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -600,12 +600,10 @@ asmlinkage long sys_utrap_install(utrap_entry_t type,
         }
         if (!current_thread_info()->utraps) {
                 current_thread_info()->utraps =
-                        kmalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long), GFP_KERNEL);
+                        kzalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long), GFP_KERNEL);
                 if (!current_thread_info()->utraps)
                         return -ENOMEM;
                 current_thread_info()->utraps[0] = 1;
-                memset(current_thread_info()->utraps+1, 0,
-                       UT_TRAP_INSTRUCTION_31*sizeof(long));
         } else {
                 if ((utrap_handler_t)current_thread_info()->utraps[type] != new_p &&
                     current_thread_info()->utraps[0] > 1) {
diff --git a/arch/sparc64/kernel/us2e_cpufreq.c b/arch/sparc64/kernel/us2e_cpufreq.c
index 669fb83dd4f5..1f83fe6a82d6 100644
--- a/arch/sparc64/kernel/us2e_cpufreq.c
+++ b/arch/sparc64/kernel/us2e_cpufreq.c
@@ -357,20 +357,16 @@ static int __init us2e_freq_init(void)
                 struct cpufreq_driver *driver;
 
                 ret = -ENOMEM;
-                driver = kmalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
+                driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
                 if (!driver)
                         goto err_out;
-                memset(driver, 0, sizeof(*driver));
 
-                us2e_freq_table = kmalloc(
+                us2e_freq_table = kzalloc(
                         (NR_CPUS * sizeof(struct us2e_freq_percpu_info)),
                         GFP_KERNEL);
                 if (!us2e_freq_table)
                         goto err_out;
 
-                memset(us2e_freq_table, 0,
-                       (NR_CPUS * sizeof(struct us2e_freq_percpu_info)));
-
                 driver->init = us2e_freq_cpu_init;
                 driver->verify = us2e_freq_verify;
                 driver->target = us2e_freq_target;
diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c
index a912c45bdc05..47e3acafb5be 100644
--- a/arch/sparc64/kernel/us3_cpufreq.c
+++ b/arch/sparc64/kernel/us3_cpufreq.c
@@ -218,20 +218,16 @@ static int __init us3_freq_init(void)
                 struct cpufreq_driver *driver;
 
                 ret = -ENOMEM;
-                driver = kmalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
+                driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
                 if (!driver)
                         goto err_out;
-                memset(driver, 0, sizeof(*driver));
 
-                us3_freq_table = kmalloc(
+                us3_freq_table = kzalloc(
                         (NR_CPUS * sizeof(struct us3_freq_percpu_info)),
                         GFP_KERNEL);
                 if (!us3_freq_table)
                         goto err_out;
 
-                memset(us3_freq_table, 0,
-                       (NR_CPUS * sizeof(struct us3_freq_percpu_info)));
-
                 driver->init = us3_freq_cpu_init;
                 driver->verify = us3_freq_verify;
                 driver->target = us3_freq_target;