diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /include/asm-generic/unaligned.h | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-generic/unaligned.h')
| -rw-r--r-- | include/asm-generic/unaligned.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h index 4dc8ddb401c1..09ec447fe2af 100644 --- a/include/asm-generic/unaligned.h +++ b/include/asm-generic/unaligned.h | |||
| @@ -78,7 +78,7 @@ static inline void __ustw(__u16 val, __u16 *addr) | |||
| 78 | 78 | ||
| 79 | #define __get_unaligned(ptr, size) ({ \ | 79 | #define __get_unaligned(ptr, size) ({ \ |
| 80 | const void *__gu_p = ptr; \ | 80 | const void *__gu_p = ptr; \ |
| 81 | __typeof__(*(ptr)) val; \ | 81 | __u64 val; \ |
| 82 | switch (size) { \ | 82 | switch (size) { \ |
| 83 | case 1: \ | 83 | case 1: \ |
| 84 | val = *(const __u8 *)__gu_p; \ | 84 | val = *(const __u8 *)__gu_p; \ |
| @@ -95,7 +95,7 @@ static inline void __ustw(__u16 val, __u16 *addr) | |||
| 95 | default: \ | 95 | default: \ |
| 96 | bad_unaligned_access_length(); \ | 96 | bad_unaligned_access_length(); \ |
| 97 | }; \ | 97 | }; \ |
| 98 | val; \ | 98 | (__typeof__(*(ptr)))val; \ |
| 99 | }) | 99 | }) |
| 100 | 100 | ||
| 101 | #define __put_unaligned(val, ptr, size) \ | 101 | #define __put_unaligned(val, ptr, size) \ |