Commit ae189623b7248cd245c068a1aeb4983359f9c088

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent cfcac2f7dd

ia64: introduce asm/swab.h

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 36 additions and 36 deletions Side-by-side Diff

arch/ia64/include/asm/Kbuild
... ... @@ -14,4 +14,5 @@
14 14 unifdef-y += intrinsics.h
15 15 unifdef-y += perfmon.h
16 16 unifdef-y += ustack.h
  17 +unifdef-y += swab.h
arch/ia64/include/asm/byteorder.h
1 1 #ifndef _ASM_IA64_BYTEORDER_H
2 2 #define _ASM_IA64_BYTEORDER_H
3 3  
4   -/*
5   - * Modified 1998, 1999
6   - * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
7   - */
8   -
9   -#include <asm/types.h>
10   -#include <asm/intrinsics.h>
11   -#include <linux/compiler.h>
12   -
13   -static __inline__ __attribute_const__ __u64
14   -__ia64_swab64 (__u64 x)
15   -{
16   - __u64 result;
17   -
18   - result = ia64_mux1(x, ia64_mux1_rev);
19   - return result;
20   -}
21   -
22   -static __inline__ __attribute_const__ __u32
23   -__ia64_swab32 (__u32 x)
24   -{
25   - return __ia64_swab64(x) >> 32;
26   -}
27   -
28   -static __inline__ __attribute_const__ __u16
29   -__ia64_swab16(__u16 x)
30   -{
31   - return __ia64_swab64(x) >> 48;
32   -}
33   -
34   -#define __arch__swab64(x) __ia64_swab64(x)
35   -#define __arch__swab32(x) __ia64_swab32(x)
36   -#define __arch__swab16(x) __ia64_swab16(x)
37   -
38   -#define __BYTEORDER_HAS_U64__
39   -
  4 +#include <asm/swab.h>
40 5 #include <linux/byteorder/little_endian.h>
41 6  
42 7 #endif /* _ASM_IA64_BYTEORDER_H */
arch/ia64/include/asm/swab.h
  1 +#ifndef _ASM_IA64_SWAB_H
  2 +#define _ASM_IA64_SWAB_H
  3 +
  4 +/*
  5 + * Modified 1998, 1999
  6 + * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
  7 + */
  8 +
  9 +#include <asm/types.h>
  10 +#include <asm/intrinsics.h>
  11 +#include <linux/compiler.h>
  12 +
  13 +static __inline__ __attribute_const__ __u64 __arch_swab64(__u64 x)
  14 +{
  15 + __u64 result;
  16 +
  17 + result = ia64_mux1(x, ia64_mux1_rev);
  18 + return result;
  19 +}
  20 +#define __arch_swab64 __arch_swab64
  21 +
  22 +static __inline__ __attribute_const__ __u32 __arch_swab32(__u32 x)
  23 +{
  24 + return __arch_swab64(x) >> 32;
  25 +}
  26 +#define __arch_swab32 __arch_swab32
  27 +
  28 +static __inline__ __attribute_const__ __u16 __arch_swab16(__u16 x)
  29 +{
  30 + return __arch_swab64(x) >> 48;
  31 +}
  32 +#define __arch_swab16 __arch_swab16
  33 +
  34 +#endif /* _ASM_IA64_SWAB_H */