From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LnfTU-0001Yr-Fh for qemu-devel@nongnu.org; Sat, 28 Mar 2009 16:49:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LnfTQ-0001Vb-VL for qemu-devel@nongnu.org; Sat, 28 Mar 2009 16:49:52 -0400 Received: from [199.232.76.173] (port=60545 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LnfTQ-0001VY-Pe for qemu-devel@nongnu.org; Sat, 28 Mar 2009 16:49:48 -0400 Received: from mx20.gnu.org ([199.232.41.8]:7807) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LnfTQ-0000Ux-EI for qemu-devel@nongnu.org; Sat, 28 Mar 2009 16:49:48 -0400 Received: from mail.codesourcery.com ([65.74.133.4]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LnfTP-0003R0-Gg for qemu-devel@nongnu.org; Sat, 28 Mar 2009 16:49:47 -0400 From: Nathan Froyd Date: Sat, 28 Mar 2009 13:49:46 -0700 Message-Id: <1238273386-7652-1-git-send-email-froydnj@codesourcery.com> Subject: [Qemu-devel] [PATCH] linux-user: fix problems with inotify syscalls Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The sys_inotify* calls are defined if the target supports them and the host supports the necessary syscalls. But the syscalls are handled if the target supports them. This situation leads to compilation failures when the host doesn't support the necessary syscalls, as the linker will complain about undefined functions. Fix this state of affairs by making the handling conditions the same as the call definition conditions. Signed-off-by: Nathan Froyd --- linux-user/syscall.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 226ee6c..8608171 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6109,19 +6109,19 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6); break; #endif -#ifdef TARGET_NR_inotify_init +#if defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init) case TARGET_NR_inotify_init: ret = get_errno(sys_inotify_init()); break; #endif -#ifdef TARGET_NR_inotify_add_watch +#if defined(TARGET_NR_inotify_add_watch) && defined(__NR_inotify_add_watch) case TARGET_NR_inotify_add_watch: p = lock_user_string(arg2); ret = get_errno(sys_inotify_add_watch(arg1, path(p), arg3)); unlock_user(p, arg2, 0); break; #endif -#ifdef TARGET_NR_inotify_rm_watch +#if defined(TARGET_NR_inotify_rm_watch) && defined(__NR_inotify_rm_watch) case TARGET_NR_inotify_rm_watch: ret = get_errno(sys_inotify_rm_watch(arg1, arg2)); break; -- 1.6.0.5