]> git.wh0rd.org - patches.git/blob - linux-rename-val-in-get_unaligned.patch
initial import
[patches.git] / linux-rename-val-in-get_unaligned.patch
1 diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h
2 index 09ec447..50189d1 100644
3 --- a/include/asm-generic/unaligned.h
4 +++ b/include/asm-generic/unaligned.h
5 @@ -78,24 +78,24 @@ static inline void __ustw(__u16 val, __u16 *addr)
6
7 #define __get_unaligned(ptr, size) ({ \
8 const void *__gu_p = ptr; \
9 - __u64 val; \
10 + __u64 __val; \
11 switch (size) { \
12 case 1: \
13 - val = *(const __u8 *)__gu_p; \
14 + __val = *(const __u8 *)__gu_p; \
15 break; \
16 case 2: \
17 - val = __uldw(__gu_p); \
18 + __val = __uldw(__gu_p); \
19 break; \
20 case 4: \
21 - val = __uldl(__gu_p); \
22 + __val = __uldl(__gu_p); \
23 break; \
24 case 8: \
25 - val = __uldq(__gu_p); \
26 + __val = __uldq(__gu_p); \
27 break; \
28 default: \
29 bad_unaligned_access_length(); \
30 }; \
31 - (__typeof__(*(ptr)))val; \
32 + (__typeof__(*(ptr)))__val; \
33 })
34
35 #define __put_unaligned(val, ptr, size) \