diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /include/linux/byteorder | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/byteorder')
| -rw-r--r-- | include/linux/byteorder/swabb.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/linux/byteorder/swabb.h b/include/linux/byteorder/swabb.h index d28d9a804d3b..d5f2a3205109 100644 --- a/include/linux/byteorder/swabb.h +++ b/include/linux/byteorder/swabb.h | |||
| @@ -92,29 +92,32 @@ | |||
| 92 | #endif /* OPTIMIZE */ | 92 | #endif /* OPTIMIZE */ |
| 93 | 93 | ||
| 94 | 94 | ||
| 95 | static __inline__ __const__ __u32 __fswahw32(__u32 x) | 95 | static inline __u32 __fswahw32(__u32 x) |
| 96 | { | 96 | { |
| 97 | return __arch__swahw32(x); | 97 | return __arch__swahw32(x); |
| 98 | } | 98 | } |
| 99 | static __inline__ __u32 __swahw32p(__u32 *x) | 99 | |
| 100 | static inline __u32 __swahw32p(__u32 *x) | ||
| 100 | { | 101 | { |
| 101 | return __arch__swahw32p(x); | 102 | return __arch__swahw32p(x); |
| 102 | } | 103 | } |
| 103 | static __inline__ void __swahw32s(__u32 *addr) | 104 | |
| 105 | static inline void __swahw32s(__u32 *addr) | ||
| 104 | { | 106 | { |
| 105 | __arch__swahw32s(addr); | 107 | __arch__swahw32s(addr); |
| 106 | } | 108 | } |
| 107 | 109 | ||
| 108 | 110 | static inline __u32 __fswahb32(__u32 x) | |
| 109 | static __inline__ __const__ __u32 __fswahb32(__u32 x) | ||
| 110 | { | 111 | { |
| 111 | return __arch__swahb32(x); | 112 | return __arch__swahb32(x); |
| 112 | } | 113 | } |
| 113 | static __inline__ __u32 __swahb32p(__u32 *x) | 114 | |
| 115 | static inline __u32 __swahb32p(__u32 *x) | ||
| 114 | { | 116 | { |
| 115 | return __arch__swahb32p(x); | 117 | return __arch__swahb32p(x); |
| 116 | } | 118 | } |
| 117 | static __inline__ void __swahb32s(__u32 *addr) | 119 | |
| 120 | static inline void __swahb32s(__u32 *addr) | ||
| 118 | { | 121 | { |
| 119 | __arch__swahb32s(addr); | 122 | __arch__swahb32s(addr); |
| 120 | } | 123 | } |