diff -Naurp -X /home/jbarnes/dontdiff 050-max-nr-memblks-increase.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c 060-no-pci-probe-medusa.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c
--- 050-max-nr-memblks-increase.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Wed Dec 17 18:59:17 2003
+++ 060-no-pci-probe-medusa.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Tue Dec 30 16:39:13 2003
@@ -867,8 +867,8 @@ sn_pci_init (void)
 	int i = 0;
 	struct pci_controller *controller;
 
-	if (!ia64_platform_is("sn2"))
-	    return 0;
+	if (!ia64_platform_is("sn2") || IS_RUNNING_ON_SIMULATOR())
+		return 0;
 
 	/*
 	 * set pci_raw_ops, etc.