diff -urN old/arch/alpha/kernel/core_mcpcia.c new/arch/alpha/kernel/core_mcpcia.c
--- old/arch/alpha/kernel/core_mcpcia.c	Wed Jun  7 17:26:42 2000
+++ new/arch/alpha/kernel/core_mcpcia.c	Mon Oct  2 17:59:52 2000
@@ -190,7 +190,7 @@
 {
 	unsigned long addr;
 
-	if (!pci_probe_enabled)
+	if (!pci_probe_enabled || !hose->pci_config_space)
 		return -1;
 
 	DBG_CFG(("mk_conf_addr(bus=%d ,device_fn=0x%x, where=0x%x,"
diff -urN old/arch/alpha/kernel/core_tsunami.c new/arch/alpha/kernel/core_tsunami.c
--- old/arch/alpha/kernel/core_tsunami.c	Wed May  3 20:16:30 2000
+++ new/arch/alpha/kernel/core_tsunami.c	Mon Oct  2 18:00:34 2000
@@ -91,7 +91,7 @@
 {
 	unsigned long addr;
 
-	if (!pci_probe_enabled)
+	if (!pci_probe_enabled || !hose->pci_config_space)
 		return -1;
 
 	DBG_CFG(("mk_conf_addr(bus=%d ,device_fn=0x%x, where=0x%x, "
diff -urN old/arch/alpha/kernel/smp.c new/arch/alpha/kernel/smp.c
--- old/arch/alpha/kernel/smp.c	Mon Oct  2 16:14:19 2000
+++ new/arch/alpha/kernel/smp.c	Mon Oct  2 18:07:46 2000
@@ -543,12 +543,12 @@
 	bogosum = 0;
         for (i = 0; i < NR_CPUS; i++) {
 		if (cpu_present_mask & (1L << i))
-			bogosum += cpu_data[i].loops_per_sec;
+			bogosum += cpu_data[i].loops_per_jiffy;
         }
 	printk(KERN_INFO "SMP: Total of %d processors activated "
 	       "(%lu.%02lu BogoMIPS).\n",
-	       cpu_count, (bogosum + 2500) / 500000,
-	       ((bogosum + 2500) / 5000) % 100);
+	       cpu_count, (bogosum + 2500) / (500000 / HZ),
+	       ((bogosum + 2500) / (5000 / HZ)) % 100);
 
 	smp_num_cpus = cpu_count;
 }