Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6946
Modified Files:
byteorder.h
Log Message:
- Update for GCC-4.1 snapshot.
Index: byteorder.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/byteorder.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- byteorder.h 5 Jun 2004 08:34:16 -0000 1.5
+++ byteorder.h 20 Apr 2005 13:46:19 -0000 1.6
@@ -1,18 +1,18 @@
#ifndef _VAX_BYTEORDER_H
#define _VAX_BYTEORDER_H
-/* FIXME: arch byte swapping in assembly
- */
+/* FIXME: arch byte swapping in assembly */
#include <asm/types.h>
+#include <linux/compiler.h>
#define VAX_USE_ARCH_SWAB32 1
#ifdef __GNUC__
-/*
- * ragge has a 1 insn shorter sequence which will probably replace this one
- * later, depending on the relative instruction costs.
+/*
+ * ragge has a 1 insn shorter sequence which will probably replace this one
+ * later, depending on the relative instruction costs.
*/
#if VAX_USE_ARCH_SWAB32
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
{
__u32 t1;
@@ -33,10 +33,10 @@
/*
* According to the resident expert, this is as fast as assembly
*/
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
{
- register __u16 __x = x;
- return (__u16)(__x << 8 | __x >> 8);
+ __u16 __x = x;
+ return (__u16)(__x << 8 | __x >> 8);
}
#if VAX_USE_ARCH_SWAB32
#define __arch__swab32(x) ___arch__swab32(x)
@@ -50,7 +50,6 @@
#endif /* __GNUC__ */
-
#include <linux/byteorder/little_endian.h>
#endif /* _VAX_BYTEORDER_H */
|
