patch-2.3.99-pre3 linux/arch/alpha/kernel/core_cia.c

• Lines: 34
• Date: Tue Mar 21 10:46:21 2000
• Orig file: v2.3.99-pre2/linux/arch/alpha/kernel/core_cia.c
• Orig date: Sun Mar 19 18:35:30 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/arch/alpha/kernel/core_cia.c linux/arch/alpha/kernel/core_cia.c
@@ -529,7 +529,7 @@
 	/* Fifth, verify that a previously invalid PTE entry gets
 	   filled from the page table.  */
 
-	data0 = 0xabcdef123;
+	data0 = 0xabcdef12;
 	page[0] = data0;
 	arena->ptes[5] = pte0;
 	mcheck_expected(0) = 1;
@@ -640,7 +640,6 @@
 	pci_isa_hose = hose = alloc_pci_controler();
 	hose->io_space = &ioport_resource;
 	hose->mem_space = &iomem_resource;
-	hose->config_space = CIA_CONF;
 	hose->index = 0;
 
 	if (! is_pyxis) {
@@ -654,6 +653,16 @@
 
 		if (request_resource(&iomem_resource, hae_mem) < 0)
 			printk(KERN_ERR "Failed to request HAE_MEM\n");
+
+		hose->sparse_mem_base = CIA_SPARSE_MEM - IDENT_ADDR;
+		hose->dense_mem_base = CIA_DENSE_MEM - IDENT_ADDR;
+		hose->sparse_io_base = CIA_IO - IDENT_ADDR;
+		hose->dense_io_base = 0;
+	} else {
+		hose->sparse_mem_base = 0;
+		hose->dense_mem_base = CIA_BW_MEM - IDENT_ADDR;
+		hose->sparse_io_base = 0;
+		hose->dense_io_base = CIA_BW_IO - IDENT_ADDR;
 	}
 
 	/*