From 601a0e5173636e6cc472772940929d0a5f3e4b1a Mon Sep 17 00:00:00 2001 From: njoly Date: Fri, 16 Nov 2007 12:56:50 +0000 Subject: [PATCH] Update, for linux_sys_readlink() removal. --- sys/compat/linux32/arch/amd64/syscalls.master | 4 +-- sys/compat/linux32/common/linux32_unistd.c | 25 ++----------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/sys/compat/linux32/arch/amd64/syscalls.master b/sys/compat/linux32/arch/amd64/syscalls.master index e262f75670df..0528c7550bdf 100644 --- a/sys/compat/linux32/arch/amd64/syscalls.master +++ b/sys/compat/linux32/arch/amd64/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.19 2007/11/07 00:24:30 njoly Exp $ + $NetBSD: syscalls.master,v 1.20 2007/11/16 12:56:50 njoly Exp $ ; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file. ; (See syscalls.conf to see what it is processed into.) @@ -173,7 +173,7 @@ const netbsd32_charp link); } 84 NOARGS { int compat_43_netbsd32_lstat43(const netbsd32_charp \ path, netbsd32_stat43p_t ub); } -85 STD { int linux32_sys_readlink(const netbsd32_charp name, \ +85 NOARGS { int netbsd32_readlink(const netbsd32_charp name, \ netbsd32_charp buf, int count); } 86 UNIMPL uselib 87 STD { int linux32_sys_swapon(netbsd32_charp name); } diff --git a/sys/compat/linux32/common/linux32_unistd.c b/sys/compat/linux32/common/linux32_unistd.c index 94e81922c8a6..f9f4de9509ce 100644 --- a/sys/compat/linux32/common/linux32_unistd.c +++ b/sys/compat/linux32/common/linux32_unistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_unistd.c,v 1.13 2007/11/07 00:24:31 njoly Exp $ */ +/* $NetBSD: linux32_unistd.c,v 1.14 2007/11/16 12:56:50 njoly Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.13 2007/11/07 00:24:31 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.14 2007/11/16 12:56:50 njoly Exp $"); #include #include @@ -111,27 +111,6 @@ linux32_sys_llseek(l, v, retval) return linux_sys_llseek(l, &ua, retval); } -int -linux32_sys_readlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; -{ - struct linux32_sys_readlink_args /* { - syscallarg(const netbsd32_charp) name; - syscallarg(netbsd32_charp) buf; - syscallarg(int) count; - } */ *uap = v; - struct linux_sys_readlink_args ua; - - NETBSD32TOP_UAP(name, const char); - NETBSD32TOP_UAP(buf, char) - NETBSD32TO64_UAP(count); - - return linux_sys_readlink(l, &ua, retval); -} - - int linux32_sys_select(l, v, retval) struct lwp *l;