patch-2.3.33 linux/include/asm-alpha/io.h

Next file: linux/include/asm-alpha/pgtable.h
Previous file: linux/include/asm-alpha/delay.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.32/linux/include/asm-alpha/io.h linux/include/asm-alpha/io.h
@@ -53,10 +53,7 @@
  */
 static inline unsigned long virt_to_phys(volatile void * address)
 {
-	/* Conditionalize this on the CPU?  This here is 40 bits,
-	   whereas EV4 only supports 34.  But KSEG is farther out
-	   so it shouldn't _really_ matter.  */
-	return 0xffffffffffUL & (unsigned long) address;
+	return (unsigned long)address - IDENT_ADDR;
 }
 
 static inline void * phys_to_virt(unsigned long address)
@@ -265,6 +262,11 @@
 static inline void iounmap(void *addr)
 {
 }
+
+static inline void * ioremap_nocache(unsigned long offset, unsigned long size)
+{
+	return ioremap(offset, size);
+} 
 
 /* Indirect back to the macros provided.  */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)