|
@@ -702,14 +702,12 @@ static int __init balanced_irq_init(void)
|
|
physical_balance = 1;
|
|
physical_balance = 1;
|
|
|
|
|
|
for_each_online_cpu(i) {
|
|
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) {
|
|
if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) {
|
|
printk(KERN_ERR "balanced_irq_init: out of memory");
|
|
printk(KERN_ERR "balanced_irq_init: out of memory");
|
|
goto failed;
|
|
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");
|
|
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++) {
|
|
for (i = 0; i < nr_ioapics; i++) {
|
|
size = sizeof(struct sys_device) + nr_ioapic_registers[i]
|
|
size = sizeof(struct sys_device) + nr_ioapic_registers[i]
|
|
* sizeof(struct IO_APIC_route_entry);
|
|
* 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]) {
|
|
if (!mp_ioapic_data[i]) {
|
|
printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i);
|
|
printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- memset(mp_ioapic_data[i], 0, size);
|
|
|
|
dev = &mp_ioapic_data[i]->dev;
|
|
dev = &mp_ioapic_data[i]->dev;
|
|
dev->id = i;
|
|
dev->id = i;
|
|
dev->cls = &ioapic_sysdev_class;
|
|
dev->cls = &ioapic_sysdev_class;
|