diff options
| author | Anton Blanchard <anton@samba.org> | 2003-01-04 01:10:05 +1100 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-01-04 01:10:05 +1100 |
| commit | b19c2cf7fa678718e654d795e008723c6403b616 (patch) | |
| tree | 307a514fb3183a59d81a8e06f1ce3dbc27d58c4f /include | |
| parent | 7fc33a1bd97070ced75bb691c25effc0b02ec711 (diff) | |
| parent | 76712f91d59991524785c7734b9df0c577b435d2 (diff) | |
Merge samba.org:/scratch/anton/sfr
into samba.org:/scratch/anton/for-alan
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/compat.h | 5 | ||||
| -rw-r--r-- | include/asm-ppc64/ppc32.h | 12 |
2 files changed, 6 insertions, 11 deletions
diff --git a/include/asm-ppc64/compat.h b/include/asm-ppc64/compat.h index 84513bd7d86e..8ad44c0e53d4 100644 --- a/include/asm-ppc64/compat.h +++ b/include/asm-ppc64/compat.h @@ -18,7 +18,12 @@ typedef u32 compat_mode_t; typedef u32 compat_ino_t; typedef u32 compat_dev_t; typedef s32 compat_off_t; +typedef s64 compat_loff_t; typedef s16 compat_nlink_t; +typedef u16 compat_ipc_pid_t; +typedef s32 compat_daddr_t; +typedef u32 compat_caddr_t; +typedef __kernel_fsid_t compat_fsid_t; struct compat_timespec { compat_time_t tv_sec; diff --git a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h index 5b601337ffaa..5b7a8dc91bda 100644 --- a/include/asm-ppc64/ppc32.h +++ b/include/asm-ppc64/ppc32.h @@ -14,11 +14,6 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef __KERNEL_STRICT_NAMES -#include <linux/types.h> -typedef __kernel_fsid_t __kernel_fsid_t32; -#endif - /* Use this to get at 32-bit user passed pointers. */ /* Things to consider: the low-level assembly stub does srl x, 0, x for first four arguments, so if you have @@ -44,11 +39,6 @@ typedef __kernel_fsid_t __kernel_fsid_t32; }) /* These are here to support 32-bit syscalls on a 64-bit kernel. */ -typedef unsigned short __kernel_ipc_pid_t32; -typedef unsigned int __kernel_umode_t32; -typedef int __kernel_daddr_t32; -typedef unsigned int __kernel_caddr_t32; -typedef int __kernel_loff_t32; struct statfs32 { int f_type; @@ -58,7 +48,7 @@ struct statfs32 { int f_bavail; int f_files; int f_ffree; - __kernel_fsid_t32 f_fsid; + compat_fsid_t f_fsid; int f_namelen; /* SunOS ignores this field. */ int f_spare[6]; }; |