Skip to content

Commit

Permalink
ia64: introduce asm/swab.h
Browse files Browse the repository at this point in the history
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Jan 7, 2009
1 parent cfcac2f commit ae18962
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
1 change: 1 addition & 0 deletions arch/ia64/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ unifdef-y += gcc_intrin.h
unifdef-y += intrinsics.h
unifdef-y += perfmon.h
unifdef-y += ustack.h
unifdef-y += swab.h
37 changes: 1 addition & 36 deletions arch/ia64/include/asm/byteorder.h
Original file line number Diff line number Diff line change
@@ -1,42 +1,7 @@
#ifndef _ASM_IA64_BYTEORDER_H
#define _ASM_IA64_BYTEORDER_H

/*
* Modified 1998, 1999
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
*/

#include <asm/types.h>
#include <asm/intrinsics.h>
#include <linux/compiler.h>

static __inline__ __attribute_const__ __u64
__ia64_swab64 (__u64 x)
{
__u64 result;

result = ia64_mux1(x, ia64_mux1_rev);
return result;
}

static __inline__ __attribute_const__ __u32
__ia64_swab32 (__u32 x)
{
return __ia64_swab64(x) >> 32;
}

static __inline__ __attribute_const__ __u16
__ia64_swab16(__u16 x)
{
return __ia64_swab64(x) >> 48;
}

#define __arch__swab64(x) __ia64_swab64(x)
#define __arch__swab32(x) __ia64_swab32(x)
#define __arch__swab16(x) __ia64_swab16(x)

#define __BYTEORDER_HAS_U64__

#include <asm/swab.h>
#include <linux/byteorder/little_endian.h>

#endif /* _ASM_IA64_BYTEORDER_H */
34 changes: 34 additions & 0 deletions arch/ia64/include/asm/swab.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#ifndef _ASM_IA64_SWAB_H
#define _ASM_IA64_SWAB_H

/*
* Modified 1998, 1999
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
*/

#include <asm/types.h>
#include <asm/intrinsics.h>
#include <linux/compiler.h>

static __inline__ __attribute_const__ __u64 __arch_swab64(__u64 x)
{
__u64 result;

result = ia64_mux1(x, ia64_mux1_rev);
return result;
}
#define __arch_swab64 __arch_swab64

static __inline__ __attribute_const__ __u32 __arch_swab32(__u32 x)
{
return __arch_swab64(x) >> 32;
}
#define __arch_swab32 __arch_swab32

static __inline__ __attribute_const__ __u16 __arch_swab16(__u16 x)
{
return __arch_swab64(x) >> 48;
}
#define __arch_swab16 __arch_swab16

#endif /* _ASM_IA64_SWAB_H */

0 comments on commit ae18962

Please sign in to comment.