[PATCH] Fix x86_64 compilation breakage caused by 92c05fc1a32e5ccef5e0e8201f32dcdab041524c

[Nigel Cunningham <ncunningham@cyclades.com>]

Hi.

This patch fixes x86_64 compilation, which was broken by git patch
92c05fc1a32e5ccef5e0e8201f32dcdab041524c. It makes the same
sorts of changes that were made for the i386 version in that patch.

Please apply.

Signed-off-by: Nigel Cunningham <nigel@suspend2.net>

 mmconfig.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
diff -ruNp 9906.patch-old/arch/x86_64/pci/mmconfig.c 9906.patch-new/arch/x86_64/pci/mmconfig.c
--- 9906.patch-old/arch/x86_64/pci/mmconfig.c	2006-03-24 12:11:33.000000000 +1000
+++ 9906.patch-new/arch/x86_64/pci/mmconfig.c	2006-03-24 16:13:24.000000000 +1000
@@ -148,24 +148,24 @@ static __init void unreachable_devices(v
 	}
 }
 
-static int __init pci_mmcfg_init(void)
+void __init pci_mmcfg_init(void)
 {
 	int i;
 
 	if ((pci_probe & PCI_PROBE_MMCONF) == 0)
-		return 0;
+		return;
 
 	acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg);
 	if ((pci_mmcfg_config_num == 0) ||
 	    (pci_mmcfg_config == NULL) ||
 	    (pci_mmcfg_config[0].base_address == 0))
-		return 0;
+		return;
 
 	/* RED-PEN i386 doesn't do _nocache right now */
 	pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL);
 	if (pci_mmcfg_virt == NULL) {
 		printk("PCI: Can not allocate memory for mmconfig structures\n");
-		return 0;
+		return;
 	}
 	for (i = 0; i < pci_mmcfg_config_num; ++i) {
 		pci_mmcfg_virt[i].cfg = &pci_mmcfg_config[i];
@@ -173,7 +173,7 @@ static int __init pci_mmcfg_init(void)
 		if (!pci_mmcfg_virt[i].virt) {
 			printk("PCI: Cannot map mmconfig aperture for segment %d\n",
 			       pci_mmcfg_config[i].pci_segment_group_number);
-			return 0;
+			return;
 		}
 		printk(KERN_INFO "PCI: Using MMCONFIG at %x\n", pci_mmcfg_config[i].base_address);
 	}
@@ -182,8 +182,4 @@ static int __init pci_mmcfg_init(void)
 
 	raw_pci_ops = &pci_mmcfg;
 	pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
-
-	return 0;
 }
-
-arch_initcall(pci_mmcfg_init);

Attachment: pgp4xTEX1iCaC.pgp
Description: PGP signature