summaryrefslogtreecommitdiffstats
path: root/include/asm-sh64/byteorder.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 00:34:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 00:34:46 -0400
commit4291130595065aa3c9fbb9130231f65e4914629a (patch)
tree988be49185231866ac4e42d6154994b244e6f991 /include/asm-sh64/byteorder.h
parentd3148ce9a65813a8020473739c200cb63036f84c (diff)
parenteff68d452f1a6842fb05218fd93c774ffc4dbc5a (diff)
downloadtalos-op-linux-4291130595065aa3c9fbb9130231f65e4914629a.tar.gz
talos-op-linux-4291130595065aa3c9fbb9130231f65e4914629a.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-sh64/byteorder.h')
-rw-r--r--include/asm-sh64/byteorder.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh64/byteorder.h b/include/asm-sh64/byteorder.h
index f602ebe334eb..7419d78820ee 100644
--- a/include/asm-sh64/byteorder.h
+++ b/include/asm-sh64/byteorder.h
@@ -14,7 +14,7 @@
#include <asm/types.h>
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
{
__asm__("byterev %0, %0\n\t"
"shari %0, 32, %0"
@@ -23,7 +23,7 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
return x;
}
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
{
__asm__("byterev %0, %0\n\t"
"shari %0, 48, %0"
OpenPOWER on IntegriCloud