summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 22:03:56 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-15 22:03:56 +0200
commitb3c9816b9fa9a7b75ab36111eb76eca03e5bab78 (patch)
treee30d1e9841c1196193e24eb284f0349a17ab776f
parent1a781a777b2f6ac46523fe92396215762ced624d (diff)
downloadlinux-b3c9816b9fa9a7b75ab36111eb76eca03e5bab78.tar.bz2
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: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/pci/amd_bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index a18141ae3f02..dbf532369711 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -578,7 +578,7 @@ static int __init enable_pci_io_ecs(void)
/* assume all cpus from fam10h have IO ECS */
if (boot_cpu_data.x86 < 0x10)
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;
return 0;
}