mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
m68k: merge the non-MMU and MMU versions of swab.h
It is trivial to merge the non-MMU and MMU versions of swab.h. Without a single file "make headers_install" is broken for m68k (since each of the sub-varients of swab.h are not installed). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
parent
f9847004bf
commit
9863a0babc
3 changed files with 26 additions and 44 deletions
|
@ -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 */
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
#ifndef _M68K_SWAB_H
|
||||
#define _M68K_SWAB_H
|
||||
|
||||
#include <asm/types.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#define __SWAB_64_THRU_32__
|
||||
|
||||
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 /* _M68K_SWAB_H */
|
|
@ -1,24 +0,0 @@
|
|||
#ifndef _M68KNOMMU_SWAB_H
|
||||
#define _M68KNOMMU_SWAB_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
|
||||
# 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 __arch_swab32
|
||||
#endif
|
||||
|
||||
#endif /* _M68KNOMMU_SWAB_H */
|
Loading…
Reference in a new issue