aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-07-31 03:39:11 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 18:39:42 -0400
commit937472b00b666ecbf1464502f857ec63b024af72 (patch)
treeb557078de19c3370488cfed8ce45b261518ee09d /include/asm-generic
parent07ff8ee79e254ac07205d2c9c9e8fbe2f4b3e6e8 (diff)
use __val in __get_unaligned
Use "__val" rather than "val" in the __get_unaligned macro in asm-generic/unaligned.h. This way gcc wont warn if you happen to also name something in the same scope "val". Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/unaligned.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h
index 16a466e50681..2fe1b2e67f01 100644
--- a/include/asm-generic/unaligned.h
+++ b/include/asm-generic/unaligned.h
@@ -79,24 +79,24 @@ static inline void __ustw(__u16 val, __u16 *addr)
79 79
80#define __get_unaligned(ptr, size) ({ \ 80#define __get_unaligned(ptr, size) ({ \
81 const void *__gu_p = ptr; \ 81 const void *__gu_p = ptr; \
82 __u64 val; \ 82 __u64 __val; \
83 switch (size) { \ 83 switch (size) { \
84 case 1: \ 84 case 1: \
85 val = *(const __u8 *)__gu_p; \ 85 __val = *(const __u8 *)__gu_p; \
86 break; \ 86 break; \
87 case 2: \ 87 case 2: \
88 val = __uldw(__gu_p); \ 88 __val = __uldw(__gu_p); \
89 break; \ 89 break; \
90 case 4: \ 90 case 4: \
91 val = __uldl(__gu_p); \ 91 __val = __uldl(__gu_p); \
92 break; \ 92 break; \
93 case 8: \ 93 case 8: \
94 val = __uldq(__gu_p); \ 94 __val = __uldq(__gu_p); \
95 break; \ 95 break; \
96 default: \ 96 default: \
97 bad_unaligned_access_length(); \ 97 bad_unaligned_access_length(); \
98 }; \ 98 }; \
99 (__force __typeof__(*(ptr)))val; \ 99 (__force __typeof__(*(ptr)))__val; \
100}) 100})
101 101
102#define __put_unaligned(val, ptr, size) \ 102#define __put_unaligned(val, ptr, size) \