diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2004-11-10 21:29:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-10 21:29:16 -0800 |
| commit | 6998fe2529d33f5441dbfed6e924c990d052c167 (patch) | |
| tree | 43dcdacf076cd263d08efc1fe3894fa4c4a70346 /kernel | |
| parent | ccaf8b47238e60266ca417e13a8261f2f228f089 (diff) | |
| download | history-6998fe2529d33f5441dbfed6e924c990d052c167.tar.gz | |
[PATCH] compat syscalls naming standardisation
On PA-RISC, we have a unified syscall table for 32 and 64 bit that uses
macros to generate the appropriate syscall names (native vs compat). For
this to work, we need consistent compat syscall names. Unfortunately, some
recent additions drop the 'sys_'.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/compat.c | 12 | ||||
| -rw-r--r-- | kernel/sys_ni.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index 33880d2240775b..672310635347a0 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -484,7 +484,7 @@ static int put_compat_itimerspec(struct compat_itimerspec __user *dst, return 0; } -long compat_timer_settime(timer_t timer_id, int flags, +long compat_sys_timer_settime(timer_t timer_id, int flags, struct compat_itimerspec __user *new, struct compat_itimerspec __user *old) { @@ -507,7 +507,7 @@ long compat_timer_settime(timer_t timer_id, int flags, return err; } -long compat_timer_gettime(timer_t timer_id, +long compat_sys_timer_gettime(timer_t timer_id, struct compat_itimerspec __user *setting) { long err; @@ -524,7 +524,7 @@ long compat_timer_gettime(timer_t timer_id, return err; } -long compat_clock_settime(clockid_t which_clock, +long compat_sys_clock_settime(clockid_t which_clock, struct compat_timespec __user *tp) { long err; @@ -541,7 +541,7 @@ long compat_clock_settime(clockid_t which_clock, return err; } -long compat_clock_gettime(clockid_t which_clock, +long compat_sys_clock_gettime(clockid_t which_clock, struct compat_timespec __user *tp) { long err; @@ -558,7 +558,7 @@ long compat_clock_gettime(clockid_t which_clock, return err; } -long compat_clock_getres(clockid_t which_clock, +long compat_sys_clock_getres(clockid_t which_clock, struct compat_timespec __user *tp) { long err; @@ -575,7 +575,7 @@ long compat_clock_getres(clockid_t which_clock, return err; } -long compat_clock_nanosleep(clockid_t which_clock, int flags, +long compat_sys_clock_nanosleep(clockid_t which_clock, int flags, struct compat_timespec __user *rqtp, struct compat_timespec __user *rmtp) { diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 233da576a92352..9f36b40cab65e1 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -68,9 +68,9 @@ cond_syscall(compat_sys_mq_getsetattr) cond_syscall(sys_mbind) cond_syscall(sys_get_mempolicy) cond_syscall(sys_set_mempolicy) -cond_syscall(compat_mbind) -cond_syscall(compat_get_mempolicy) -cond_syscall(compat_set_mempolicy) +cond_syscall(compat_sys_mbind) +cond_syscall(compat_sys_get_mempolicy) +cond_syscall(compat_sys_set_mempolicy) cond_syscall(sys_add_key) cond_syscall(sys_request_key) cond_syscall(sys_keyctl) |