Commit c9f9bada authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David Mosberger

[PATCH] ia64: arch-specific part of 1st compat clean up

Just in case you need it, here it is against recent Linus' BK tree
that has the generic part applied.
parent 288ba2ff
...@@ -418,6 +418,11 @@ config IA32_SUPPORT ...@@ -418,6 +418,11 @@ config IA32_SUPPORT
run IA-32 Linux binaries on an IA-64 Linux system. run IA-32 Linux binaries on an IA-64 Linux system.
If in doubt, say Y. If in doubt, say Y.
config COMPAT
bool
depends on IA32_SUPPORT
default y
config PERFMON config PERFMON
bool "Performance monitor support" bool "Performance monitor support"
help help
......
...@@ -221,7 +221,7 @@ ia32_syscall_table: ...@@ -221,7 +221,7 @@ ia32_syscall_table:
data8 sys32_alarm data8 sys32_alarm
data8 sys32_ni_syscall data8 sys32_ni_syscall
data8 sys32_pause data8 sys32_pause
data8 sys32_utime /* 30 */ data8 compat_sys_utime /* 30 */
data8 sys32_ni_syscall /* old stty syscall holder */ data8 sys32_ni_syscall /* old stty syscall holder */
data8 sys32_ni_syscall /* old gtty syscall holder */ data8 sys32_ni_syscall /* old gtty syscall holder */
data8 sys_access data8 sys_access
...@@ -295,8 +295,8 @@ ia32_syscall_table: ...@@ -295,8 +295,8 @@ ia32_syscall_table:
data8 sys32_ioperm data8 sys32_ioperm
data8 sys32_socketcall data8 sys32_socketcall
data8 sys_syslog data8 sys_syslog
data8 sys32_setitimer data8 compat_sys_setitimer
data8 sys32_getitimer /* 105 */ data8 compat_sys_getitimer /* 105 */
data8 sys32_newstat data8 sys32_newstat
data8 sys32_newlstat data8 sys32_newlstat
data8 sys32_newfstat data8 sys32_newfstat
...@@ -353,7 +353,7 @@ ia32_syscall_table: ...@@ -353,7 +353,7 @@ ia32_syscall_table:
data8 sys_sched_get_priority_max data8 sys_sched_get_priority_max
data8 sys_sched_get_priority_min /* 160 */ data8 sys_sched_get_priority_min /* 160 */
data8 sys32_sched_rr_get_interval data8 sys32_sched_rr_get_interval
data8 sys32_nanosleep data8 compat_sys_nanosleep
data8 sys_mremap data8 sys_mremap
data8 sys_setresuid /* 16-bit version */ data8 sys_setresuid /* 16-bit version */
data8 sys32_getresuid16 /* 16-bit version */ /* 165 */ data8 sys32_getresuid16 /* 16-bit version */ /* 165 */
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/compat.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/rse.h> #include <asm/rse.h>
...@@ -592,8 +593,8 @@ sys32_sigprocmask (int how, unsigned int *set, unsigned int *oset) ...@@ -592,8 +593,8 @@ sys32_sigprocmask (int how, unsigned int *set, unsigned int *oset)
} }
asmlinkage long asmlinkage long
sys32_rt_sigtimedwait (sigset32_t *uthese, siginfo_t32 *uinfo, struct timespec32 *uts, sys32_rt_sigtimedwait (sigset32_t *uthese, siginfo_t32 *uinfo,
unsigned int sigsetsize) struct compat_timespec *uts, unsigned int sigsetsize)
{ {
extern asmlinkage long sys_rt_sigtimedwait (const sigset_t *, siginfo_t *, extern asmlinkage long sys_rt_sigtimedwait (const sigset_t *, siginfo_t *,
const struct timespec *, size_t); const struct timespec *, size_t);
......
This diff is collapsed.
#ifndef _ASM_IA64_COMPAT_H
#define _ASM_IA64_COMPAT_H
/*
* Architecture specific compatibility types
*/
#include <linux/types.h>
typedef u32 compat_size_t;
typedef s32 compat_ssize_t;
typedef s32 compat_time_t;
struct compat_timespec {
compat_time_t tv_sec;
s32 tv_nsec;
};
struct compat_timeval {
compat_time_t tv_sec;
s32 tv_usec;
};
#endif /* _ASM_IA64_COMPAT_H */
...@@ -12,10 +12,7 @@ ...@@ -12,10 +12,7 @@
*/ */
/* 32bit compatibility types */ /* 32bit compatibility types */
typedef unsigned int __kernel_size_t32;
typedef int __kernel_ssize_t32;
typedef int __kernel_ptrdiff_t32; typedef int __kernel_ptrdiff_t32;
typedef int __kernel_time_t32;
typedef int __kernel_clock_t32; typedef int __kernel_clock_t32;
typedef int __kernel_pid_t32; typedef int __kernel_pid_t32;
typedef unsigned short __kernel_ipc_pid_t32; typedef unsigned short __kernel_ipc_pid_t32;
...@@ -41,11 +38,6 @@ typedef __kernel_fsid_t __kernel_fsid_t32; ...@@ -41,11 +38,6 @@ typedef __kernel_fsid_t __kernel_fsid_t32;
#define IA32_CLOCKS_PER_SEC 100 /* Cast in stone for IA32 Linux */ #define IA32_CLOCKS_PER_SEC 100 /* Cast in stone for IA32 Linux */
#define IA32_TICK(tick) ((unsigned long long)(tick) * IA32_CLOCKS_PER_SEC / CLOCKS_PER_SEC) #define IA32_TICK(tick) ((unsigned long long)(tick) * IA32_CLOCKS_PER_SEC / CLOCKS_PER_SEC)
struct timespec32 {
int tv_sec;
int tv_nsec;
};
/* fcntl.h */ /* fcntl.h */
struct flock32 { struct flock32 {
short l_type; short l_type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment