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

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

diff -u --recursive --new-file v2.1.91/linux/include/asm-alpha/io.h linux/include/asm-alpha/io.h
@@ -25,7 +25,11 @@
 /*
  * Virtual -> physical identity mapping starts at this offset
  */
+#ifdef USE_48_BIT_KSEG
+#define IDENT_ADDR	(0xffff800000000000UL)
+#else
 #define IDENT_ADDR	(0xfffffc0000000000UL)
+#endif
 
 #ifdef __KERNEL__
 
@@ -38,11 +42,11 @@
  */
 extern inline void set_hae(unsigned long new_hae)
 {
-	unsigned long ipl;
-	ipl = swpipl(7);
+	unsigned long ipl = swpipl(7);
 	hae.cache = new_hae;
 	*hae.reg = new_hae;
 	mb();
+	new_hae = *hae.reg; /* read to make sure it was written */
 	setipl(ipl);
 }
 
@@ -84,6 +88,10 @@
 # include <asm/t2.h>		/* get chip-specific definitions */
 #elif defined(CONFIG_ALPHA_PYXIS)
 # include <asm/pyxis.h>		/* get chip-specific definitions */
+#elif defined(CONFIG_ALPHA_TSUNAMI)
+# include <asm/tsunami.h>	/* get chip-specific definitions */
+#elif defined(CONFIG_ALPHA_MCPCIA)
+# include <asm/mcpcia.h>	/* get chip-specific definitions */
 #else
 # include <asm/jensen.h>
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov