From 5528010c6b54708c180632018afe3b23b0678f81 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Fri, 15 Oct 2010 14:34:14 -0700 Subject: [PATCH] --- yaml --- r: 211523 b: refs/heads/master c: 79b5dc0c64d88cda3da23b2e22a5cec0964372ac h: refs/heads/master i: 211521: 62612da94b495328ef240d2d5655d39fe12640fe 211519: 506ebcd7df66134200516c284f65fb89c9b35118 v: v3 --- [refs] | 2 +- trunk/include/linux/types.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b9272ea1f7c..deec64e27236 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3c6cf61815b0af0c697aeed4c6f11762f913002 +refs/heads/master: 79b5dc0c64d88cda3da23b2e22a5cec0964372ac diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h index 01a082f56ef4..357dbc19606f 100644 --- a/trunk/include/linux/types.h +++ b/trunk/include/linux/types.h @@ -121,7 +121,15 @@ typedef __u64 u_int64_t; typedef __s64 int64_t; #endif -/* this is a special 64bit data type that is 8-byte aligned */ +/* + * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid + * common 32/64-bit compat problems. + * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other + * architectures) and to 8-byte boundaries on 64-bit architetures. The new + * aligned_64 type enforces 8-byte alignment so that structs containing + * aligned_64 values have the same alignment on 32-bit and 64-bit architectures. + * No conversions are necessary between 32-bit user-space and a 64-bit kernel. + */ #define aligned_u64 __u64 __attribute__((aligned(8))) #define aligned_be64 __be64 __attribute__((aligned(8))) #define aligned_le64 __le64 __attribute__((aligned(8))) @@ -178,6 +186,11 @@ typedef __u64 __bitwise __be64; typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; +/* this is a special 64bit data type that is 8-byte aligned */ +#define __aligned_u64 __u64 __attribute__((aligned(8))) +#define __aligned_be64 __be64 __attribute__((aligned(8))) +#define __aligned_le64 __le64 __attribute__((aligned(8))) + #ifdef __KERNEL__ typedef unsigned __bitwise__ gfp_t; typedef unsigned __bitwise__ fmode_t;