]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
MIPS: PCI: Fix MIPS build
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Thu, 19 Nov 2020 10:26:33 +0000 (10:26 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Nov 2020 09:14:11 +0000 (10:14 +0100)
While backporting 37640adbefd6 ("MIPS: PCI: remember nasid changed by
set interrupt affinity") something went wrong and an extra 'n' was added.
So 'data->nasid' became 'data->nnasid' and the MIPS builds started failing.

This is only needed for 5.4-stable tree.

Fixes: 957978aa56f1 ("MIPS: PCI: remember nasid changed by set interrupt affinity")
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/pci/pci-xtalk-bridge.c

index c4b1c6cf26606c6a2a47023a0182f44c7daf5e37..adc9f83b2c448af69d1a52afae9b398b4c4fc2ed 100644 (file)
@@ -284,7 +284,7 @@ static int bridge_set_affinity(struct irq_data *d, const struct cpumask *mask,
        ret = irq_chip_set_affinity_parent(d, mask, force);
        if (ret >= 0) {
                cpu = cpumask_first_and(mask, cpu_online_mask);
-               data->nnasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
+               data->nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
                bridge_write(data->bc, b_int_addr[pin].addr,
                             (((data->bc->intr_addr >> 30) & 0x30000) |
                              bit | (data->nasid << 8)));