diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2005-11-08 21:38:01 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-09 19:24:04 -0500 |
commit | 8882a4da1c932c9f311c9f739e6719adea3e25d9 (patch) | |
tree | 1cf5e23780468d35305cde874f31c6223693908f /include/asm-powerpc/compat.h | |
parent | 584224e4095d8abcf2bef38efacc291be9a44c20 (diff) |
[PATCH] powerpc: Move various ppc64 files with no ppc32 equivalent to powerpc
This patch moves a bunch of files from arch/ppc64 and
include/asm-ppc64 which have no equivalents in ppc32 code into
arch/powerpc and include/asm-powerpc. The file affected are:
abs_addr.h
compat.h
lppaca.h
paca.h
tce.h
cpu_setup_power4.S
ioctl32.c
firmware.c
pacaData.c
The only changes apart from the move and corresponding Makefile
changes are:
- #ifndef/#define in includes updated to _ASM_POWERPC_ form
- trailing whitespace removed
- comments giving full paths removed
- pacaData.c renamed paca.c to remove studlyCaps
- Misplaced { moved in lppaca.h
Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built
for 32-bit powermac (ARCH=powerpc).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/compat.h')
-rw-r--r-- | include/asm-powerpc/compat.h | 205 |
1 files changed, 205 insertions, 0 deletions
diff --git a/include/asm-powerpc/compat.h b/include/asm-powerpc/compat.h new file mode 100644 index 000000000000..4db4360c4d4a --- /dev/null +++ b/include/asm-powerpc/compat.h | |||
@@ -0,0 +1,205 @@ | |||
1 | #ifndef _ASM_POWERPC_COMPAT_H | ||
2 | #define _ASM_POWERPC_COMPAT_H | ||
3 | /* | ||
4 | * Architecture specific compatibility types | ||
5 | */ | ||
6 | #include <linux/types.h> | ||
7 | #include <linux/sched.h> | ||
8 | |||
9 | #define COMPAT_USER_HZ 100 | ||
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_pid_t; | ||
16 | typedef u32 __compat_uid_t; | ||
17 | typedef u32 __compat_gid_t; | ||
18 | typedef u32 __compat_uid32_t; | ||
19 | typedef u32 __compat_gid32_t; | ||
20 | typedef u32 compat_mode_t; | ||
21 | typedef u32 compat_ino_t; | ||
22 | typedef u32 compat_dev_t; | ||
23 | typedef s32 compat_off_t; | ||
24 | typedef s64 compat_loff_t; | ||
25 | typedef s16 compat_nlink_t; | ||
26 | typedef u16 compat_ipc_pid_t; | ||
27 | typedef s32 compat_daddr_t; | ||
28 | typedef u32 compat_caddr_t; | ||
29 | typedef __kernel_fsid_t compat_fsid_t; | ||
30 | typedef s32 compat_key_t; | ||
31 | typedef s32 compat_timer_t; | ||
32 | |||
33 | typedef s32 compat_int_t; | ||
34 | typedef s32 compat_long_t; | ||
35 | typedef u32 compat_uint_t; | ||
36 | typedef u32 compat_ulong_t; | ||
37 | |||
38 | struct compat_timespec { | ||
39 | compat_time_t tv_sec; | ||
40 | s32 tv_nsec; | ||
41 | }; | ||
42 | |||
43 | struct compat_timeval { | ||
44 | compat_time_t tv_sec; | ||
45 | s32 tv_usec; | ||
46 | }; | ||
47 | |||
48 | struct compat_stat { | ||
49 | compat_dev_t st_dev; | ||
50 | compat_ino_t st_ino; | ||
51 | compat_mode_t st_mode; | ||
52 | compat_nlink_t st_nlink; | ||
53 | __compat_uid32_t st_uid; | ||
54 | __compat_gid32_t st_gid; | ||
55 | compat_dev_t st_rdev; | ||
56 | compat_off_t st_size; | ||
57 | compat_off_t st_blksize; | ||
58 | compat_off_t st_blocks; | ||
59 | compat_time_t st_atime; | ||
60 | u32 st_atime_nsec; | ||
61 | compat_time_t st_mtime; | ||
62 | u32 st_mtime_nsec; | ||
63 | compat_time_t st_ctime; | ||
64 | u32 st_ctime_nsec; | ||
65 | u32 __unused4[2]; | ||
66 | }; | ||
67 | |||
68 | struct compat_flock { | ||
69 | short l_type; | ||
70 | short l_whence; | ||
71 | compat_off_t l_start; | ||
72 | compat_off_t l_len; | ||
73 | compat_pid_t l_pid; | ||
74 | }; | ||
75 | |||
76 | #define F_GETLK64 12 /* using 'struct flock64' */ | ||
77 | #define F_SETLK64 13 | ||
78 | #define F_SETLKW64 14 | ||
79 | |||
80 | struct compat_flock64 { | ||
81 | short l_type; | ||
82 | short l_whence; | ||
83 | compat_loff_t l_start; | ||
84 | compat_loff_t l_len; | ||
85 | compat_pid_t l_pid; | ||
86 | }; | ||
87 | |||
88 | struct compat_statfs { | ||
89 | int f_type; | ||
90 | int f_bsize; | ||
91 | int f_blocks; | ||
92 | int f_bfree; | ||
93 | int f_bavail; | ||
94 | int f_files; | ||
95 | int f_ffree; | ||
96 | compat_fsid_t f_fsid; | ||
97 | int f_namelen; /* SunOS ignores this field. */ | ||
98 | int f_frsize; | ||
99 | int f_spare[5]; | ||
100 | }; | ||
101 | |||
102 | #define COMPAT_RLIM_OLD_INFINITY 0x7fffffff | ||
103 | #define COMPAT_RLIM_INFINITY 0xffffffff | ||
104 | |||
105 | typedef u32 compat_old_sigset_t; | ||
106 | |||
107 | #define _COMPAT_NSIG 64 | ||
108 | #define _COMPAT_NSIG_BPW 32 | ||
109 | |||
110 | typedef u32 compat_sigset_word; | ||
111 | |||
112 | #define COMPAT_OFF_T_MAX 0x7fffffff | ||
113 | #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL | ||
114 | |||
115 | /* | ||
116 | * A pointer passed in from user mode. This should not | ||
117 | * be used for syscall parameters, just declare them | ||
118 | * as pointers because the syscall entry code will have | ||
119 | * appropriately comverted them already. | ||
120 | */ | ||
121 | typedef u32 compat_uptr_t; | ||
122 | |||
123 | static inline void __user *compat_ptr(compat_uptr_t uptr) | ||
124 | { | ||
125 | return (void __user *)(unsigned long)uptr; | ||
126 | } | ||
127 | |||
128 | static inline void __user *compat_alloc_user_space(long len) | ||
129 | { | ||
130 | struct pt_regs *regs = current->thread.regs; | ||
131 | unsigned long usp = regs->gpr[1]; | ||
132 | |||
133 | /* | ||
134 | * We cant access below the stack pointer in the 32bit ABI and | ||
135 | * can access 288 bytes in the 64bit ABI | ||
136 | */ | ||
137 | if (!(test_thread_flag(TIF_32BIT))) | ||
138 | usp -= 288; | ||
139 | |||
140 | return (void __user *) (usp - len); | ||
141 | } | ||
142 | |||
143 | /* | ||
144 | * ipc64_perm is actually 32/64bit clean but since the compat layer refers to | ||
145 | * it we may as well define it. | ||
146 | */ | ||
147 | struct compat_ipc64_perm { | ||
148 | compat_key_t key; | ||
149 | __compat_uid_t uid; | ||
150 | __compat_gid_t gid; | ||
151 | __compat_uid_t cuid; | ||
152 | __compat_gid_t cgid; | ||
153 | compat_mode_t mode; | ||
154 | unsigned int seq; | ||
155 | unsigned int __pad2; | ||
156 | unsigned long __unused1; /* yes they really are 64bit pads */ | ||
157 | unsigned long __unused2; | ||
158 | }; | ||
159 | |||
160 | struct compat_semid64_ds { | ||
161 | struct compat_ipc64_perm sem_perm; | ||
162 | unsigned int __unused1; | ||
163 | compat_time_t sem_otime; | ||
164 | unsigned int __unused2; | ||
165 | compat_time_t sem_ctime; | ||
166 | compat_ulong_t sem_nsems; | ||
167 | compat_ulong_t __unused3; | ||
168 | compat_ulong_t __unused4; | ||
169 | }; | ||
170 | |||
171 | struct compat_msqid64_ds { | ||
172 | struct compat_ipc64_perm msg_perm; | ||
173 | unsigned int __unused1; | ||
174 | compat_time_t msg_stime; | ||
175 | unsigned int __unused2; | ||
176 | compat_time_t msg_rtime; | ||
177 | unsigned int __unused3; | ||
178 | compat_time_t msg_ctime; | ||
179 | compat_ulong_t msg_cbytes; | ||
180 | compat_ulong_t msg_qnum; | ||
181 | compat_ulong_t msg_qbytes; | ||
182 | compat_pid_t msg_lspid; | ||
183 | compat_pid_t msg_lrpid; | ||
184 | compat_ulong_t __unused4; | ||
185 | compat_ulong_t __unused5; | ||
186 | }; | ||
187 | |||
188 | struct compat_shmid64_ds { | ||
189 | struct compat_ipc64_perm shm_perm; | ||
190 | unsigned int __unused1; | ||
191 | compat_time_t shm_atime; | ||
192 | unsigned int __unused2; | ||
193 | compat_time_t shm_dtime; | ||
194 | unsigned int __unused3; | ||
195 | compat_time_t shm_ctime; | ||
196 | unsigned int __unused4; | ||
197 | compat_size_t shm_segsz; | ||
198 | compat_pid_t shm_cpid; | ||
199 | compat_pid_t shm_lpid; | ||
200 | compat_ulong_t shm_nattch; | ||
201 | compat_ulong_t __unused5; | ||
202 | compat_ulong_t __unused6; | ||
203 | }; | ||
204 | |||
205 | #endif /* _ASM_POWERPC_COMPAT_H */ | ||