From 76e3e3e1808b1b38740b70604d252d0bcb756d42 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Mon, 5 Jan 2009 07:19:16 -0500 Subject: [PATCH] --- yaml --- r: 125770 b: refs/heads/master c: 4ae8978cf92a96257cd8998a49e781be83571d64 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/notify/inotify/inotify_user.c | 2 +- trunk/include/linux/syscalls.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c34146731036..83c3bf35478f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f1169e2dc0c70e213f79ada88a10912cc2fbe94 +refs/heads/master: 4ae8978cf92a96257cd8998a49e781be83571d64 diff --git a/trunk/fs/notify/inotify/inotify_user.c b/trunk/fs/notify/inotify/inotify_user.c index 400f8064a548..81b8644b0136 100644 --- a/trunk/fs/notify/inotify/inotify_user.c +++ b/trunk/fs/notify/inotify/inotify_user.c @@ -704,7 +704,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *pathname, u32 m return ret; } -asmlinkage long sys_inotify_rm_watch(int fd, u32 wd) +asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd) { struct file *filp; struct inotify_device *dev; diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h index 04fb47bfb920..18d0a243a7b3 100644 --- a/trunk/include/linux/syscalls.h +++ b/trunk/include/linux/syscalls.h @@ -549,7 +549,7 @@ asmlinkage long sys_inotify_init(void); asmlinkage long sys_inotify_init1(int flags); asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask); -asmlinkage long sys_inotify_rm_watch(int fd, u32 wd); +asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd); asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, __u32 __user *ustatus);