Commit a6b0d9d2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Add the sixth arg to the sys_futex() prototype.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 97c5291a
...@@ -165,7 +165,8 @@ asmlinkage long sys_wait4(pid_t pid, unsigned int __user *stat_addr, ...@@ -165,7 +165,8 @@ asmlinkage long sys_wait4(pid_t pid, unsigned int __user *stat_addr,
asmlinkage long sys_waitpid(pid_t pid, unsigned int __user *stat_addr, int options); asmlinkage long sys_waitpid(pid_t pid, unsigned int __user *stat_addr, int options);
asmlinkage long sys_set_tid_address(int __user *tidptr); asmlinkage long sys_set_tid_address(int __user *tidptr);
asmlinkage long sys_futex(u32 __user *uaddr, int op, int val, asmlinkage long sys_futex(u32 __user *uaddr, int op, int val,
struct timespec __user *utime, u32 __user *uaddr2); struct timespec __user *utime, u32 __user *uaddr2,
int val3);
asmlinkage long sys_init_module(void __user *umod, unsigned long len, asmlinkage long sys_init_module(void __user *umod, unsigned long len,
const char __user *uargs); const char __user *uargs);
......
...@@ -516,7 +516,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) ...@@ -516,7 +516,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
* not set up a proper pointer then tough luck. * not set up a proper pointer then tough luck.
*/ */
put_user(0, tidptr); put_user(0, tidptr);
sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL); sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);
} }
} }
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/syscalls.h>
#define FUTEX_HASHBITS 8 #define FUTEX_HASHBITS 8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment