[LV-k25-commit] kernel-2.5/include/asm-vax mv.h,1.28,1.29

[Kenn H. <ke...@us...>]

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

Modified Files:
	mv.h 
Log Message:
Switch over to new-style CPU identification.  Rename the "machine vector
match" stuff to "CPU match".


Index: mv.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mv.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mv.h	2 Oct 2004 00:09:30 -0000	1.28
+++ mv.h	2 Oct 2004 11:42:47 -0000	1.29
@@ -63,13 +63,11 @@
 extern struct vax_mv mv_ka660;
 extern struct vax_mv mv_vxt;
 
-#define USE_NEW_VECTORS
-#ifdef USE_NEW_VECTORS
 /*
- * This defines a match for a machine vector and a macro to place 
+ * This defines a match for a CPU and a macro to place 
  * such a match structure into the right section at link time
  */
-struct machvec_match {
+struct cpu_match {
 	struct vax_mv *mv;
 	unsigned long sid_mask;
 	unsigned long sid_match;
@@ -78,9 +76,7 @@
 	unsigned long sidex_match;
 };
 
-#define __CPU_MATCH	__attribute_used__ __attribute__((__section__(".init.vecmatch")))
-
-#endif /* USE_NEW_VECTORS */
+#define __CPU_MATCH	__attribute_used__ __attribute__((__section__(".init.cpumatch")))
 
 
 /*