Pull kvm-patches into release branch

[linux-2.6-omap-h63xx.git] / include / asm-arm / unaligned.h

diff --git a/include/asm-arm/unaligned.h b/include/asm-arm/unaligned.h
index 8431f6eed5c6b6a5ebee2c067032e32f40302952..5db03cf3b90525d2164175288bd0f5a28f3efe7a 100644 (file)
--- a/include/asm-arm/unaligned.h
+++ b/include/asm-arm/unaligned.h
@@ -40,16 +40,16 @@ extern int __bug_unaligned_x(const void *ptr);
  */
 
 #define __get_unaligned_2_le(__p)                                      \
-       (__p[0] | __p[1] << 8)
+       (unsigned int)(__p[0] | __p[1] << 8)
 
 #define __get_unaligned_2_be(__p)                                      \
-       (__p[0] << 8 | __p[1])
+       (unsigned int)(__p[0] << 8 | __p[1])
 
 #define __get_unaligned_4_le(__p)                                      \
-       (__p[0] | __p[1] << 8 | __p[2] << 16 | __p[3] << 24)
+       (unsigned int)(__p[0] | __p[1] << 8 | __p[2] << 16 | __p[3] << 24)
 
 #define __get_unaligned_4_be(__p)                                      \
-       (__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3])
+       (unsigned int)(__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3])
 
 #define __get_unaligned_8_le(__p)                                      \
        ((unsigned long long)__get_unaligned_4_le((__p+4)) << 32 |      \