diff options
| author |   Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-13 19:31:29 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 19:56:49 -0800 |
| commit | aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd (patch) | |
| tree | a58e482f511aa2c79a3ca9d3025ec9ffe55c405e /arch/cris/include/arch-v10 | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| download | linux-dev-aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd.tar.xz linux-dev-aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd.zip | |
cris: introduce asm/swab.h
Adjust the arch overrides to the new names as well.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/include/arch-v10')
| -rw-r--r-- | arch/cris/include/arch-v10/arch/swab.h (renamed from arch/cris/include/arch-v10/arch/byteorder.h) | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/cris/include/arch-v10/arch/byteorder.h b/arch/cris/include/arch-v10/arch/swab.h index 255b646b7fa8..e4e847d8a05e 100644 --- a/arch/cris/include/arch-v10/arch/byteorder.h +++ b/arch/cris/include/arch-v10/arch/swab.h @@ -1,26 +1,30 @@ -#ifndef _CRIS_ARCH_BYTEORDER_H -#define _CRIS_ARCH_BYTEORDER_H +#ifndef _CRIS_ARCH_SWAB_H +#define _CRIS_ARCH_SWAB_H #include <asm/types.h> #include <linux/compiler.h> +#define __SWAB_64_THRU_32__ + /* we just define these two (as we can do the swap in a single * asm instruction in CRIS) and the arch-independent files will put * them together into ntohl etc. */ -static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) +static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { __asm__ ("swapwb %0" : "=r" (x) : "0" (x)); - + return(x); } +#define __arch_swab32 __arch_swab32 -static inline __attribute_const__ __u16 ___arch__swab16(__u16 x) +static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { __asm__ ("swapb %0" : "=r" (x) : "0" (x)); - + return(x); } +#define __arch_swab16 __arch_swab16 #endif |