|
@@ -2567,29 +2567,25 @@ static struct resource * __init ioapic_setup_resources(void)
|
|
unsigned long n;
|
|
unsigned long n;
|
|
struct resource *res;
|
|
struct resource *res;
|
|
char *mem;
|
|
char *mem;
|
|
- int i, num = 0;
|
|
|
|
|
|
+ int i;
|
|
|
|
|
|
- for_each_ioapic(i)
|
|
|
|
- num++;
|
|
|
|
- if (num == 0)
|
|
|
|
|
|
+ if (nr_ioapics == 0)
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
|
|
n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
|
|
- n *= num;
|
|
|
|
|
|
+ n *= nr_ioapics;
|
|
|
|
|
|
mem = alloc_bootmem(n);
|
|
mem = alloc_bootmem(n);
|
|
res = (void *)mem;
|
|
res = (void *)mem;
|
|
|
|
|
|
- mem += sizeof(struct resource) * num;
|
|
|
|
|
|
+ mem += sizeof(struct resource) * nr_ioapics;
|
|
|
|
|
|
- num = 0;
|
|
|
|
for_each_ioapic(i) {
|
|
for_each_ioapic(i) {
|
|
- res[num].name = mem;
|
|
|
|
- res[num].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
|
|
|
|
|
|
+ res[i].name = mem;
|
|
|
|
+ res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
|
|
snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);
|
|
snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);
|
|
mem += IOAPIC_RESOURCE_NAME_SIZE;
|
|
mem += IOAPIC_RESOURCE_NAME_SIZE;
|
|
- ioapics[i].iomem_res = &res[num];
|
|
|
|
- num++;
|
|
|
|
|
|
+ ioapics[i].iomem_res = &res[i];
|
|
}
|
|
}
|
|
|
|
|
|
ioapic_resources = res;
|
|
ioapic_resources = res;
|