Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=937472b00b666ecbf1464502f857ec63b024af72
Commit:     937472b00b666ecbf1464502f857ec63b024af72
Parent:     07ff8ee79e254ac07205d2c9c9e8fbe2f4b3e6e8
Author:     Mike Frysinger <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 31 00:39:11 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Jul 31 15:39:42 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/asm-generic/unaligned.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h
index 16a466e..2fe1b2e 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)
 
 #define __get_unaligned(ptr, size) ({          \
        const void *__gu_p = ptr;               \
-       __u64 val;                              \
+       __u64 __val;                            \
        switch (size) {                         \
        case 1:                                 \
-               val = *(const __u8 *)__gu_p;    \
+               __val = *(const __u8 *)__gu_p;  \
                break;                          \
        case 2:                                 \
-               val = __uldw(__gu_p);           \
+               __val = __uldw(__gu_p);         \
                break;                          \
        case 4:                                 \
-               val = __uldl(__gu_p);           \
+               __val = __uldl(__gu_p);         \
                break;                          \
        case 8:                                 \
-               val = __uldq(__gu_p);           \
+               __val = __uldq(__gu_p);         \
                break;                          \
        default:                                \
                bad_unaligned_access_length();  \
        };                                      \
-       (__force __typeof__(*(ptr)))val;        \
+       (__force __typeof__(*(ptr)))__val;      \
 })
 
 #define __put_unaligned(val, ptr, size)                \
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to