diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:17:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:17:19 -0700 |
commit | 3fde80e94c2bbffbb13f5faa3340cf438440ebea (patch) | |
tree | 43eeac74dc34596772b9d9883e9208da8ae84184 /include/asm-m68knommu/byteorder.h | |
parent | ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc (diff) | |
parent | 9b0e74102494971ca37a425c63031fea68bb5b79 (diff) | |
download | kernel-crypto-3fde80e94c2bbffbb13f5faa3340cf438440ebea.tar.gz kernel-crypto-3fde80e94c2bbffbb13f5faa3340cf438440ebea.tar.xz kernel-crypto-3fde80e94c2bbffbb13f5faa3340cf438440ebea.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: put ColdFire head code into .text.head section
m68knommu: remove last use of CONFIG_FADS and CONFIG_RPXCLASSIC
m68knommu: remove RPXCLASSIC from the m68k tree
m68knommu: fec: remove FADS
m68knommu: MCF5307 PIT GENERIC_CLOCKEVENTS support
m68knommu: add read_barrier_depends() and irqs_disabled_flags()
m68knommu: add byteswap assembly opcode for ISA A+
m68knommu: add ffs and __ffs plattform which support ISA A+ or ISA C
m68knommu: add sched_clock() for the DMA timer
m68knommu: complete generic time
m68knommu: move code within time.c
m68knommu: m68knommu: add old stack trace method
m68knommu: Add Coldfire DMA Timer support
m68knommu: defconfig for M5407C3 board
m68knommu: defconfig for M5307C3 board
m68knommu: defconfig for M5275EVB board
m68knommu: defconfig for M5249EVB board
m68knommu: change to a configs directory for board configurations
Diffstat (limited to 'include/asm-m68knommu/byteorder.h')
-rw-r--r-- | include/asm-m68knommu/byteorder.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/asm-m68knommu/byteorder.h b/include/asm-m68knommu/byteorder.h index 8fcde907b0f..20bb4426b61 100644 --- a/include/asm-m68knommu/byteorder.h +++ b/include/asm-m68knommu/byteorder.h @@ -1,13 +1,27 @@ #ifndef _M68KNOMMU_BYTEORDER_H #define _M68KNOMMU_BYTEORDER_H -#include <asm/types.h> +#include <linux/types.h> #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) # define __BYTEORDER_HAS_U64__ # define __SWAB_64_THRU_32__ #endif +#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(x) ___arch__swab32(x) +#endif + #include <linux/byteorder/big_endian.h> #endif /* _M68KNOMMU_BYTEORDER_H */ |