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-v32 | |
| parent | 5bf431fa32c52e7027c4af85c7afc82326fa6d43 (diff) | |
| download | kernel-crypto-aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd.tar.gz kernel-crypto-aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd.tar.xz kernel-crypto-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-v32')
| -rw-r--r-- | arch/cris/include/arch-v32/arch/byteorder.h | 20 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/swab.h | 24 |
2 files changed, 24 insertions, 20 deletions
diff --git a/arch/cris/include/arch-v32/arch/byteorder.h b/arch/cris/include/arch-v32/arch/byteorder.h deleted file mode 100644 index 6ef8fb4a35f..00000000000 --- a/arch/cris/include/arch-v32/arch/byteorder.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _ASM_CRIS_ARCH_BYTEORDER_H -#define _ASM_CRIS_ARCH_BYTEORDER_H - -#include <asm/types.h> - -static inline __const__ __u32 -___arch__swab32(__u32 x) -{ - __asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x)); - return (x); -} - -static inline __const__ __u16 -___arch__swab16(__u16 x) -{ - __asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x)); - return (x); -} - -#endif /* _ASM_CRIS_ARCH_BYTEORDER_H */ diff --git a/arch/cris/include/arch-v32/arch/swab.h b/arch/cris/include/arch-v32/arch/swab.h new file mode 100644 index 00000000000..9a4ea5e209c --- /dev/null +++ b/arch/cris/include/arch-v32/arch/swab.h @@ -0,0 +1,24 @@ +#ifndef _ASM_CRIS_ARCH_SWAB_H +#define _ASM_CRIS_ARCH_SWAB_H + +#include <asm/types.h> + +#define __SWAB_64_THRU_32__ + +static inline __const__ __u32 +__arch_swab32(__u32 x) +{ + __asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x)); + return (x); +} +#define __arch_swab32 __arch_swab32 + +static inline __const__ __u16 +__arch_swab16(__u16 x) +{ + __asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x)); + return (x); +} +#define __arch_swab16 __arch_swab16 + +#endif /* _ASM_CRIS_ARCH_SWAB_H */ |