[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka46.c,1.16,1.17

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31777

Modified Files:
	cpu_ka46.c 
Log Message:
- Reference implementation of a vector match for the KA46. This isn't
  yet tested (this box isn't yet attached to the power cord since I
  came back from Oldenburg).



Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cpu_ka46.c	18 Sep 2004 23:06:33 -0000	1.16
+++ cpu_ka46.c	29 Sep 2004 10:44:14 -0000	1.17
@@ -81,7 +81,9 @@
 	ka46_cache_clear();
 	ka46_cache_enable();
 
+#ifndef USE_NEW_VECTORS
 	mv_ka46.sidex = *(unsigned int *)RIGEL_SIDEX_ADDR;
+#endif
 
 	__mtpr(PR_ACCS, 2);	/* Enable floating points */
 }
@@ -137,6 +139,19 @@
 	.clock_init = ka4x_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+struct machvec_match mvm_ka46 = {
+	.mv = &mv_ka46,
+	.sid_mask = VAX_SID_FAMILY_MASK,
+	.sid_match = VAX_MARIAH << VAX_SID_FAMILY_SHIFT,
+	.sidex_addr = RIGEL_SIDEX_ADDR, /* This is bogus: mariah isn't rigel
+					   and so it should have an own
+					   define! */
+	.sidex_mask = 0x00000000,
+	.sidex_match = 0x00000000,
+};
+#endif /* USE_NEW_VECTORS */
+
 static struct platform_device ka46_vsbus_device = {
 	.name = "ka4x-vsbus"
 };