.. | .. |
---|
90 | 90 | |
---|
91 | 91 | ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg); |
---|
92 | 92 | if (ret >= 0) { |
---|
93 | | - if (info->uv_limit == UV_AFFINITY_CPU) |
---|
| 93 | + if (info->uv.limit == UV_AFFINITY_CPU) |
---|
94 | 94 | irq_set_status_flags(virq, IRQ_NO_BALANCING); |
---|
95 | 95 | else |
---|
96 | 96 | irq_set_status_flags(virq, IRQ_MOVE_PCNTXT); |
---|
97 | 97 | |
---|
98 | | - chip_data->pnode = uv_blade_to_pnode(info->uv_blade); |
---|
99 | | - chip_data->offset = info->uv_offset; |
---|
| 98 | + chip_data->pnode = uv_blade_to_pnode(info->uv.blade); |
---|
| 99 | + chip_data->offset = info->uv.offset; |
---|
100 | 100 | irq_domain_set_info(domain, virq, virq, &uv_irq_chip, chip_data, |
---|
101 | | - handle_percpu_irq, NULL, info->uv_name); |
---|
| 101 | + handle_percpu_irq, NULL, info->uv.name); |
---|
102 | 102 | } else { |
---|
103 | 103 | kfree(chip_data); |
---|
104 | 104 | } |
---|
.. | .. |
---|
193 | 193 | |
---|
194 | 194 | init_irq_alloc_info(&info, cpumask_of(cpu)); |
---|
195 | 195 | info.type = X86_IRQ_ALLOC_TYPE_UV; |
---|
196 | | - info.uv_limit = limit; |
---|
197 | | - info.uv_blade = mmr_blade; |
---|
198 | | - info.uv_offset = mmr_offset; |
---|
199 | | - info.uv_name = irq_name; |
---|
| 196 | + info.uv.limit = limit; |
---|
| 197 | + info.uv.blade = mmr_blade; |
---|
| 198 | + info.uv.offset = mmr_offset; |
---|
| 199 | + info.uv.name = irq_name; |
---|
200 | 200 | |
---|
201 | 201 | return irq_domain_alloc_irqs(domain, 1, |
---|
202 | 202 | uv_blade_to_memory_nid(mmr_blade), &info); |
---|