Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c9816b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

generic-ipi: merge fix 



fix merge fallout:

arch/x86/pci/amd_bus.c: In function ‘enable_pci_io_ecs':
arch/x86/pci/amd_bus.c:581: error: too many arguments to function ‘on_each_cpu'

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1a781a77

arch/x86/pci/amd_bus.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -578,7 +578,7 @@ static int __init enable_pci_io_ecs(void) 
	/* assume all cpus from fam10h have IO ECS */

	/* assume all cpus from fam10h have IO ECS */

        if (boot_cpu_data.x86 < 0x10)

        if (boot_cpu_data.x86 < 0x10)

		return 0;

		return 0;

	on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1, 1);

	on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1);

	pci_probe |= PCI_HAS_IO_ECS;

	pci_probe |= PCI_HAS_IO_ECS;

	return 0;

	return 0;

}

}