[PATCH] powerpc: Merge asm-ppc*/posix_types.h

[karo-tx-linux.git] / include / asm-powerpc / posix_types.h

diff --git a/include/asm-ppc64/posix_types.h b/include/asm-powerpc/posix_types.h
similarity index 88%
rename from include/asm-ppc64/posix_types.h
rename to include/asm-powerpc/posix_types.h
index 516de7201b5d09a00c3fe7736e6e327452da7b6d..c6391077224fbb05eab2a5f3038fc245c0aaf0de 100644 (file)
--- a/include/asm-ppc64/posix_types.h
+++ b/include/asm-powerpc/posix_types.h
@@ -1,44 +1,54 @@
-#ifndef _PPC64_POSIX_TYPES_H
-#define _PPC64_POSIX_TYPES_H
+#ifndef _ASM_POWERPC_POSIX_TYPES_H
+#define _ASM_POWERPC_POSIX_TYPES_H
 
 /*
  * This file is generally used by user-level software, so you need to
  * be a little careful about namespace pollution etc.  Also, we cannot
  * assume GCC is being used.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
  */
 
 typedef unsigned long  __kernel_ino_t;
-typedef unsigned long          __kernel_nlink_t;
 typedef unsigned int   __kernel_mode_t;
 typedef long           __kernel_off_t;
-typedef long long      __kernel_loff_t;
 typedef int            __kernel_pid_t;
-typedef int             __kernel_ipc_pid_t;
 typedef unsigned int   __kernel_uid_t;
 typedef unsigned int   __kernel_gid_t;
-typedef unsigned long  __kernel_size_t;
-typedef long           __kernel_ssize_t;
 typedef long           __kernel_ptrdiff_t;
 typedef long           __kernel_time_t;
+typedef long           __kernel_clock_t;
 typedef int            __kernel_timer_t;
 typedef int            __kernel_clockid_t;
 typedef long           __kernel_suseconds_t;
-typedef long           __kernel_clock_t;
 typedef int            __kernel_daddr_t;
 typedef char *         __kernel_caddr_t;
 typedef unsigned short __kernel_uid16_t;
 typedef unsigned short __kernel_gid16_t;
 typedef unsigned int   __kernel_uid32_t;
 typedef unsigned int   __kernel_gid32_t;
-
 typedef unsigned int   __kernel_old_uid_t;
 typedef unsigned int   __kernel_old_gid_t;
+
+#ifdef __powerpc64__
+typedef unsigned long          __kernel_nlink_t;
+typedef int             __kernel_ipc_pid_t;
+typedef unsigned long  __kernel_size_t;
+typedef long           __kernel_ssize_t;
 typedef unsigned long  __kernel_old_dev_t;
+#else
+typedef unsigned short __kernel_nlink_t;
+typedef short          __kernel_ipc_pid_t;
+typedef unsigned int   __kernel_size_t;
+typedef int            __kernel_ssize_t;
+typedef unsigned int   __kernel_old_dev_t;
+#endif
+
+#ifdef __powerpc64__
+typedef long long      __kernel_loff_t;
+#else
+#ifdef __GNUC__
+typedef long long      __kernel_loff_t;
+#endif
+#endif
 
 typedef struct {
        int     val[2];
@@ -116,4 +126,4 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p)
 
 #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
 #endif /* __GNUC__ */
-#endif /* _PPC64_POSIX_TYPES_H */
+#endif /* _ASM_POWERPC_POSIX_TYPES_H */