include/linux/types.h: define aligned_ types based on uapi header

<uapi/linux/types.h> has the same typedefs except that it prefixes them
with double-underscore for user space.  Use them for the kernel space
typedefs.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Masahiro Yamada <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: Lihao Liang <[email protected]>
Cc: Philippe Ombredanne <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/types.h b/include/linux/types.h
index ec13d02b348119df58d554f6c636bb9dfb92cd37..be1589763e0a2546200a2a84b0608fc211b7acc7 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -115,9 +115,9 @@ typedef             __s64           int64_t;
 #endif
 
 /* 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)))
+#define aligned_u64            __aligned_u64
+#define aligned_be64           __aligned_be64
+#define aligned_le64           __aligned_le64
 
 /**
  * The type used for indexing onto a disc or disc partition.