| .. | .. |
|---|
| 20 | 20 | #include <asm/irqdomain.h> |
|---|
| 21 | 21 | #include <asm/hpet.h> |
|---|
| 22 | 22 | #include <asm/apic.h> |
|---|
| 23 | +#include <asm/io_apic.h> |
|---|
| 23 | 24 | #include <asm/pci_x86.h> |
|---|
| 24 | 25 | #include <asm/setup.h> |
|---|
| 25 | 26 | #include <asm/i8259.h> |
|---|
| 27 | +#include <asm/prom.h> |
|---|
| 26 | 28 | |
|---|
| 27 | 29 | __initdata u64 initial_dtb; |
|---|
| 28 | 30 | char __initdata cmd_line[COMMAND_LINE_SIZE]; |
|---|
| .. | .. |
|---|
| 140 | 142 | int ret; |
|---|
| 141 | 143 | |
|---|
| 142 | 144 | version = GET_APIC_VERSION(apic_read(APIC_LVR)); |
|---|
| 143 | | - for_each_node_by_type(dn, "cpu") { |
|---|
| 145 | + for_each_of_cpu_node(dn) { |
|---|
| 144 | 146 | ret = of_property_read_u32(dn, "reg", &apic_id); |
|---|
| 145 | 147 | if (ret < 0) { |
|---|
| 146 | 148 | pr_warn("%pOF: missing local APIC ID\n", dn); |
|---|
| .. | .. |
|---|
| 227 | 229 | |
|---|
| 228 | 230 | it = &of_ioapic_type[type_index]; |
|---|
| 229 | 231 | ioapic_set_alloc_attr(&tmp, NUMA_NO_NODE, it->trigger, it->polarity); |
|---|
| 230 | | - tmp.ioapic_id = mpc_ioapic_id(mp_irqdomain_ioapic_idx(domain)); |
|---|
| 231 | | - tmp.ioapic_pin = fwspec->param[0]; |
|---|
| 232 | + tmp.devid = mpc_ioapic_id(mp_irqdomain_ioapic_idx(domain)); |
|---|
| 233 | + tmp.ioapic.pin = fwspec->param[0]; |
|---|
| 232 | 234 | |
|---|
| 233 | 235 | return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp); |
|---|
| 234 | 236 | } |
|---|