patch-2.4.23 linux-2.4.23/arch/ia64/sn/io/machvec/iomv.c
Next file: linux-2.4.23/arch/ia64/sn/io/machvec/pci.c
Previous file: linux-2.4.23/arch/ia64/sn/io/io.c
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/ia64/sn/io/machvec/iomv.c
- Orig date:
2003-08-25 04:44:39.000000000 -0700
diff -urN linux-2.4.22/arch/ia64/sn/io/machvec/iomv.c linux-2.4.23/arch/ia64/sn/io/machvec/iomv.c
@@ -32,7 +32,6 @@
return( (void *) (port | __IA64_UNCACHED_OFFSET));
} else {
/* but the simulator uses them... */
- unsigned long io_base;
unsigned long addr;
/*
@@ -40,13 +39,9 @@
* for accessing registers in bedrock local block
* (so we don't do port&0xfff)
*/
- if ((port >= 0x1f0 && port <= 0x1f7) ||
- port == 0x3f6 || port == 0x3f7) {
- io_base = (0xc000000fcc000000 | ((unsigned long)get_nasid() << 38));
- addr = io_base | ((port >> 2) << 12) | (port & 0xfff);
- } else {
- addr = __ia64_get_io_port_base() | ((port >> 2) << 2);
- }
+ addr = 0xc0000087cc000000 | ((port >> 2) << 12);
+ if ((port >= 0x1f0 && port <= 0x1f7) || port == 0x3f6 || port == 0x3f7)
+ addr |= port;
return(void *) addr;
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)