diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-09-23 17:02:09 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-09-23 17:02:09 -0400 |
| commit | 48a4b30124d079c765e6eaea3a7359195d7f0c37 (patch) | |
| tree | 063338ca27bf9564eae69c6a50a0cfa52cc65696 | |
| parent | 57aebd7739c8dbbf403876ee1e9673fafc83d856 (diff) | |
[IA64] remove asm/compat.h
Missed this file in commit 32974ad4907cdde6c9de612cd1b2ee0568fb9409
[IA64] Remove COMPAT_IA32 support
It is no longer needed, so remove it.
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/include/asm/compat.h | 208 |
1 files changed, 0 insertions, 208 deletions
diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h deleted file mode 100644 index 9301a282161..00000000000 --- a/arch/ia64/include/asm/compat.h +++ /dev/null | |||
| @@ -1,208 +0,0 @@ | |||
| 1 | #ifndef _ASM_IA64_COMPAT_H | ||
| 2 | #define _ASM_IA64_COMPAT_H | ||
| 3 | /* | ||
| 4 | * Architecture specific compatibility types | ||
| 5 | */ | ||
| 6 | #include <linux/types.h> | ||
| 7 | |||
| 8 | #define COMPAT_USER_HZ 100 | ||
| 9 | #define COMPAT_UTS_MACHINE "i686\0\0\0" | ||
| 10 | |||
| 11 | typedef u32 compat_size_t; | ||
| 12 | typedef s32 compat_ssize_t; | ||
| 13 | typedef s32 compat_time_t; | ||
| 14 | typedef s32 compat_clock_t; | ||
| 15 | typedef s32 compat_key_t; | ||
| 16 | typedef s32 compat_pid_t; | ||
| 17 | typedef u16 __compat_uid_t; | ||
| 18 | typedef u16 __compat_gid_t; | ||
| 19 | typedef u32 __compat_uid32_t; | ||
| 20 | typedef u32 __compat_gid32_t; | ||
| 21 | typedef u16 compat_mode_t; | ||
| 22 | typedef u32 compat_ino_t; | ||
| 23 | typedef u16 compat_dev_t; | ||
| 24 | typedef s32 compat_off_t; | ||
| 25 | typedef s64 compat_loff_t; | ||
| 26 | typedef u16 compat_nlink_t; | ||
| 27 | typedef u16 compat_ipc_pid_t; | ||
| 28 | typedef s32 compat_daddr_t; | ||
| 29 | typedef u32 compat_caddr_t; | ||
| 30 | typedef __kernel_fsid_t compat_fsid_t; | ||
| 31 | typedef s32 compat_timer_t; | ||
| 32 | |||
| 33 | typedef s32 compat_int_t; | ||
| 34 | typedef s32 compat_long_t; | ||
| 35 | typedef s64 __attribute__((aligned(4))) compat_s64; | ||
| 36 | typedef u32 compat_uint_t; | ||
| 37 | typedef u32 compat_ulong_t; | ||
| 38 | typedef u64 __attribute__((aligned(4))) compat_u64; | ||
| 39 | |||
| 40 | struct compat_timespec { | ||
| 41 | compat_time_t tv_sec; | ||
| 42 | s32 tv_nsec; | ||
| 43 | }; | ||
| 44 | |||
| 45 | struct compat_timeval { | ||
| 46 | compat_time_t tv_sec; | ||
| 47 | s32 tv_usec; | ||
| 48 | }; | ||
| 49 | |||
| 50 | struct compat_stat { | ||
| 51 | compat_dev_t st_dev; | ||
| 52 | u16 __pad1; | ||
| 53 | compat_ino_t st_ino; | ||
| 54 | compat_mode_t st_mode; | ||
| 55 | compat_nlink_t st_nlink; | ||
| 56 | __compat_uid_t st_uid; | ||
| 57 | __compat_gid_t st_gid; | ||
| 58 | compat_dev_t st_rdev; | ||
| 59 | u16 __pad2; | ||
| 60 | u32 st_size; | ||
| 61 | u32 st_blksize; | ||
| 62 | u32 st_blocks; | ||
| 63 | u32 st_atime; | ||
| 64 | u32 st_atime_nsec; | ||
| 65 | u32 st_mtime; | ||
| 66 | u32 st_mtime_nsec; | ||
| 67 | u32 st_ctime; | ||
| 68 | u32 st_ctime_nsec; | ||
| 69 | u32 __unused4; | ||
| 70 | u32 __unused5; | ||
| 71 | }; | ||
| 72 | |||
| 73 | struct compat_flock { | ||
| 74 | short l_type; | ||
| 75 | short l_whence; | ||
| 76 | compat_off_t l_start; | ||
| 77 | compat_off_t l_len; | ||
| 78 | compat_pid_t l_pid; | ||
| 79 | }; | ||
| 80 | |||
| 81 | #define F_GETLK64 12 | ||
| 82 | #define F_SETLK64 13 | ||
| 83 | #define F_SETLKW64 14 | ||
| 84 | |||
| 85 | /* | ||
| 86 | * IA32 uses 4 byte alignment for 64 bit quantities, | ||
| 87 | * so we need to pack this structure. | ||
| 88 | */ | ||
| 89 | struct compat_flock64 { | ||
| 90 | short l_type; | ||
| 91 | short l_whence; | ||
| 92 | compat_loff_t l_start; | ||
| 93 | compat_loff_t l_len; | ||
| 94 | compat_pid_t l_pid; | ||
| 95 | } __attribute__((packed)); | ||
| 96 | |||
| 97 | struct compat_statfs { | ||
| 98 | int f_type; | ||
| 99 | int f_bsize; | ||
| 100 | int f_blocks; | ||
| 101 | int f_bfree; | ||
| 102 | int f_bavail; | ||
| 103 | int f_files; | ||
| 104 | int f_ffree; | ||
| 105 | compat_fsid_t f_fsid; | ||
| 106 | int f_namelen; /* SunOS ignores this field. */ | ||
| 107 | int f_frsize; | ||
| 108 | int f_spare[5]; | ||
| 109 | }; | ||
| 110 | |||
| 111 | #define COMPAT_RLIM_OLD_INFINITY 0x7fffffff | ||
| 112 | #define COMPAT_RLIM_INFINITY 0xffffffff | ||
| 113 | |||
| 114 | typedef u32 compat_old_sigset_t; /* at least 32 bits */ | ||
| 115 | |||
| 116 | #define _COMPAT_NSIG 64 | ||
| 117 | #define _COMPAT_NSIG_BPW 32 | ||
| 118 | |||
| 119 | typedef u32 compat_sigset_word; | ||
| 120 | |||
| 121 | #define COMPAT_OFF_T_MAX 0x7fffffff | ||
| 122 | #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL | ||
| 123 | |||
| 124 | struct compat_ipc64_perm { | ||
| 125 | compat_key_t key; | ||
| 126 | __compat_uid32_t uid; | ||
| 127 | __compat_gid32_t gid; | ||
| 128 | __compat_uid32_t cuid; | ||
| 129 | __compat_gid32_t cgid; | ||
| 130 | unsigned short mode; | ||
| 131 | unsigned short __pad1; | ||
| 132 | unsigned short seq; | ||
| 133 | unsigned short __pad2; | ||
| 134 | compat_ulong_t unused1; | ||
| 135 | compat_ulong_t unused2; | ||
| 136 | }; | ||
| 137 | |||
| 138 | struct compat_semid64_ds { | ||
| 139 | struct compat_ipc64_perm sem_perm; | ||
| 140 | compat_time_t sem_otime; | ||
| 141 | compat_ulong_t __unused1; | ||
| 142 | compat_time_t sem_ctime; | ||
| 143 | compat_ulong_t __unused2; | ||
| 144 | compat_ulong_t sem_nsems; | ||
| 145 | compat_ulong_t __unused3; | ||
| 146 | compat_ulong_t __unused4; | ||
| 147 | }; | ||
| 148 | |||
| 149 | struct compat_msqid64_ds { | ||
| 150 | struct compat_ipc64_perm msg_perm; | ||
| 151 | compat_time_t msg_stime; | ||
| 152 | compat_ulong_t __unused1; | ||
| 153 | compat_time_t msg_rtime; | ||
| 154 | compat_ulong_t __unused2; | ||
| 155 | compat_time_t msg_ctime; | ||
| 156 | compat_ulong_t __unused3; | ||
| 157 | compat_ulong_t msg_cbytes; | ||
| 158 | compat_ulong_t msg_qnum; | ||
| 159 | compat_ulong_t msg_qbytes; | ||
| 160 | compat_pid_t msg_lspid; | ||
| 161 | compat_pid_t msg_lrpid; | ||
| 162 | compat_ulong_t __unused4; | ||
| 163 | compat_ulong_t __unused5; | ||
| 164 | }; | ||
| 165 | |||
| 166 | struct compat_shmid64_ds { | ||
| 167 | struct compat_ipc64_perm shm_perm; | ||
| 168 | compat_size_t shm_segsz; | ||
| 169 | compat_time_t shm_atime; | ||
| 170 | compat_ulong_t __unused1; | ||
| 171 | compat_time_t shm_dtime; | ||
| 172 | compat_ulong_t __unused2; | ||
| 173 | compat_time_t shm_ctime; | ||
| 174 | compat_ulong_t __unused3; | ||
| 175 | compat_pid_t shm_cpid; | ||
| 176 | compat_pid_t shm_lpid; | ||
| 177 | compat_ulong_t shm_nattch; | ||
| 178 | compat_ulong_t __unused4; | ||
| 179 | compat_ulong_t __unused5; | ||
| 180 | }; | ||
| 181 | |||
| 182 | /* | ||
| 183 | * A pointer passed in from user mode. This should not be used for syscall parameters, | ||
| 184 | * just declare them as pointers because the syscall entry code will have appropriately | ||
| 185 | * converted them already. | ||
| 186 | */ | ||
| 187 | typedef u32 compat_uptr_t; | ||
| 188 | |||
| 189 | static inline void __user * | ||
| 190 | compat_ptr (compat_uptr_t uptr) | ||
| 191 | { | ||
| 192 | return (void __user *) (unsigned long) uptr; | ||
| 193 | } | ||
| 194 | |||
| 195 | static inline compat_uptr_t | ||
| 196 | ptr_to_compat(void __user *uptr) | ||
| 197 | { | ||
| 198 | return (u32)(unsigned long)uptr; | ||
| 199 | } | ||
| 200 | |||
| 201 | static __inline__ void __user * | ||
| 202 | arch_compat_alloc_user_space (long len) | ||
| 203 | { | ||
| 204 | struct pt_regs *regs = task_pt_regs(current); | ||
| 205 | return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len); | ||
| 206 | } | ||
| 207 | |||
| 208 | #endif /* _ASM_IA64_COMPAT_H */ | ||
