[LV-k25-commit] kernel-2.5/include/asm-vax linkage.h,1.3,1.4

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

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

Modified Files:
	linkage.h 
Log Message:
- Throw out old cruft for other architectures.
- Indent the #defines a bit so it's easier to read.


Index: linkage.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/linkage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linkage.h	20 May 2002 00:33:39 -0000	1.3
+++ linkage.h	9 May 2005 21:10:56 -0000	1.4
@@ -1,57 +1,31 @@
-#ifndef _LINUX_LINKAGE_H
-#define _LINUX_LINKAGE_H
-
-/* what is this doing in include/linux ?
- * This is machine specific */
+#ifndef _VAX_LINKAGE_H
+#define _VAX_LINKAGE_H
 
 #ifdef __cplusplus
-#define asmlinkage extern "C"
+#  define asmlinkage extern "C"
 #else
-#define asmlinkage
+#  define asmlinkage
 #endif
 
 /* FIXME: # is a comment sign under VAX assembly */
-#define SYMBOL_NAME_STR(X) #X
-#define SYMBOL_NAME(X) X
+#define SYMBOL_NAME_STR(X)	#X
+#define SYMBOL_NAME(X)		X
 #ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X) X##:
+#  define SYMBOL_NAME_LABEL(X) X##:
 #else
-#define SYMBOL_NAME_LABEL(X) X/**/:
+#  define SYMBOL_NAME_LABEL(X) X/**/:
 #endif
 
-/* yuk.
-#ifdef __arm__
-#define __ALIGN .align 0
-#define __ALIGN_STR ".align 0"
-#else
-#ifdef __mc68000__
-#define __ALIGN .align 4
-#define __ALIGN_STR ".align 4"
-#else
-#if !defined(__i486__) && !defined(__i586__)
-#define __ALIGN .align 4,0x90
-#define __ALIGN_STR ".align 4,0x90"*/
-/*#else  *//* __i486__/__i586__ */
-/*#define __ALIGN .align 16,0x90
-#define __ALIGN_STR ".align 16,0x90"
-#endif *//* __i486__/__i586__ */
-/*#endif *//* __mc68000__ */
-/*#endif *//* __arm__ */
-
- 
 #define __ALIGN .balign 2
 #define __ALIGN_STR ".balign 2"
 
 #ifdef __ASSEMBLY__
+#  define ALIGN		__ALIGN
+#  define ALIGN_STR	__ALIGN_STR
+#  define ENTRY(name)				\
+		.globl SYMBOL_NAME(name);	\
+		ALIGN;				\
+		SYMBOL_NAME_LABEL(name)
+#endif /* __ASSEMBLY__ */
 
-#define ALIGN __ALIGN
-#define ALIGN_STR __ALIGN_STR
-
-#define ENTRY(name) \
-  .globl SYMBOL_NAME(name); \
-  ALIGN; \
-  SYMBOL_NAME_LABEL(name)
-
-#endif
-
-#endif
+#endif /* _VAX_LINKAGE_H */