Merge remote-tracking branch 'arm-current/fixes'

diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c
index 0cebd98cd88c3fcbfcb88e0d3b1eae757755b3d4..f6455273b2f8768a303db0ccc4a4e875df08eb71 100644 (file)
--- a/arch/arm/vdso/vdsomunge.c
+++ b/arch/arm/vdso/vdsomunge.c
@@ -66,7 +66,7 @@
        ((((x) & 0x000000ff) << 24) | \
         (((x) & 0x0000ff00) <<  8) | \
         (((x) & 0x00ff0000) >>  8) | \
-        (((x) & 0xff000000) << 24))
+        (((x) & 0xff000000) >> 24))
 
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #define HOST_ORDER ELFDATA2LSB