| Message ID | 1275678883-7082-3-git-send-email-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 04, 2010 at 12:14:10PM -0700, Richard Henderson wrote: > There's no _llseek on s390x either. Replace the existing > test for __x86_64__ with a functional test for __NR_llseek. > > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > linux-user/syscall.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Thanks, applied. > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 8222cb9..e94f1ee 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -208,7 +208,7 @@ _syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count) > _syscall3(int, sys_getdents64, uint, fd, struct linux_dirent64 *, dirp, uint, count); > #endif > _syscall2(int, sys_getpriority, int, which, int, who); > -#if defined(TARGET_NR__llseek) && !defined (__x86_64__) > +#if defined(TARGET_NR__llseek) && defined(__NR_llseek) > _syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, > loff_t *, res, uint, wh); > #endif > @@ -5933,7 +5933,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, > #ifdef TARGET_NR__llseek /* Not on alpha */ > case TARGET_NR__llseek: > { > -#if defined (__x86_64__) > +#if !defined(__NR_llseek) > ret = get_errno(lseek(arg1, ((uint64_t )arg2 << 32) | arg3, arg5)); > if (put_user_s64(ret, arg4)) > goto efault; > -- > 1.7.0.1 > > >
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8222cb9..e94f1ee 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -208,7 +208,7 @@ _syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count) _syscall3(int, sys_getdents64, uint, fd, struct linux_dirent64 *, dirp, uint, count); #endif _syscall2(int, sys_getpriority, int, which, int, who); -#if defined(TARGET_NR__llseek) && !defined (__x86_64__) +#if defined(TARGET_NR__llseek) && defined(__NR_llseek) _syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh); #endif @@ -5933,7 +5933,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef TARGET_NR__llseek /* Not on alpha */ case TARGET_NR__llseek: { -#if defined (__x86_64__) +#if !defined(__NR_llseek) ret = get_errno(lseek(arg1, ((uint64_t )arg2 << 32) | arg3, arg5)); if (put_user_s64(ret, arg4)) goto efault;
There's no _llseek on s390x either. Replace the existing test for __x86_64__ with a functional test for __NR_llseek. Signed-off-by: Richard Henderson <rth@twiddle.net> --- linux-user/syscall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)