Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25556c16 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Ingo Molnar
Browse files

x86, arch/x86/kernel/io_apic_32.c: use kzalloc instead of kmalloc/memset 



1) replace kmalloc/memset with equivalent kzalloc.

Signed-off-by: default avatarChristophe Jaillet <jaillet.christophe@wanadoo.fr>
Cc: cj <jaillet.christophe@wanadoo.fr>
Cc: petero2@telia.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7f0dbbc0

arch/x86/kernel/io_apic_32.c

+3 −6
Original line number Diff line number Diff line
@@ -702,14 +702,12 @@ static int __init balanced_irq_init(void) 
		physical_balance = 1;



	for_each_online_cpu(i) {

		irq_cpu_data[i].irq_delta = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL);

		irq_cpu_data[i].last_irq = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL);

		irq_cpu_data[i].irq_delta = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL);

		irq_cpu_data[i].last_irq = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL);

		if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) {

			printk(KERN_ERR "balanced_irq_init: out of memory");

			goto failed;

		}

		memset(irq_cpu_data[i].irq_delta, 0, sizeof(unsigned long) * NR_IRQS);

		memset(irq_cpu_data[i].last_irq, 0, sizeof(unsigned long) * NR_IRQS);

	}



	printk(KERN_INFO "Starting balanced_irq\n");
@@ -2382,12 +2380,11 @@ static int __init ioapic_init_sysfs(void) 
	for (i = 0; i < nr_ioapics; i++) {

		size = sizeof(struct sys_device) + nr_ioapic_registers[i]

			* sizeof(struct IO_APIC_route_entry);

		mp_ioapic_data[i] = kmalloc(size, GFP_KERNEL);

		mp_ioapic_data[i] = kzalloc(size, GFP_KERNEL);

		if (!mp_ioapic_data[i]) {

			printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i);

			continue;

		}

		memset(mp_ioapic_data[i], 0, size);

		dev = &mp_ioapic_data[i]->dev;

		dev->id = i;

		dev->cls = &ioapic_sysdev_class;