IPC: make struct ipc_ids static in ipc_namespace

[linux-2.6] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 4f0dad21c91702a86acdcd22ca1b556e84ed1203..b94c0e4efe2487a027dbc70ae9ed36336f392345 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -37,6 +37,8 @@ typedef __kernel_gid32_t      gid_t;
 typedef __kernel_uid16_t        uid16_t;
 typedef __kernel_gid16_t        gid16_t;
 
+typedef unsigned long          uintptr_t;
+
 #ifdef CONFIG_UID16
 /* This is defined by include/asm-{arch}/posix_types.h */
 typedef __kernel_old_uid_t     old_uid_t;
@@ -124,7 +126,7 @@ typedef             __s64           int64_t;
 #endif
 
 /* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#define aligned_u64 __u64 __attribute__((aligned(8)))
 #define aligned_be64 __be64 __attribute__((aligned(8)))
 #define aligned_le64 __le64 __attribute__((aligned(8)))