From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Jul 2008 20:03:56 +0000 (+0200)
Subject: generic-ipi: merge fix
X-Git-Tag: v2.6.27-rc1~1069^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b3c9816b9fa9a7b75ab36111eb76eca03e5bab78;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index a18141ae3f0..dbf53236971 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;
 }