diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-23 10:07:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-23 10:07:49 +0100 |
commit | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (patch) | |
tree | 3f6150291664b4c62e328f6b1dcff79b54db612a /arch/m68k/include/asm/swab.h | |
parent | a6bc3262c561780d2a6587aa3d5715b1e7d8fa13 (diff) | |
parent | 59fcbddaff6f862cc1584b488866d9c4a5579085 (diff) |
Merge branches 'irq/sparseirq' and 'linus' into irq/core
Diffstat (limited to 'arch/m68k/include/asm/swab.h')
-rw-r--r-- | arch/m68k/include/asm/swab.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h index 7d7dde1c73e..9e3054ea59e 100644 --- a/arch/m68k/include/asm/swab.h +++ b/arch/m68k/include/asm/swab.h @@ -1,5 +1,27 @@ -#ifdef __uClinux__ -#include "swab_no.h" -#else -#include "swab_mm.h" +#ifndef _M68K_SWAB_H +#define _M68K_SWAB_H + +#include <asm/types.h> +#include <linux/compiler.h> + +#define __SWAB_64_THRU_32__ + +#if defined (__mcfisaaplus__) || defined (__mcfisac__) +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) +{ + __asm__("byterev %0" : "=d" (val) : "0" (val)); + return val; +} + +#define __arch_swab32 __arch_swab32 +#elif !defined(__uClinux__) + +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) +{ + __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); + return val; +} +#define __arch_swab32 __arch_swab32 #endif + +#endif /* _M68K_SWAB_H */ |