diff options
Diffstat (limited to 'kernel/compat.c')
-rw-r--r-- | kernel/compat.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index b9bdd1271f44..c1601a84f8d8 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/time.h> | 17 | #include <linux/time.h> |
18 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
19 | #include <linux/sched.h> /* for MAX_SCHEDULE_TIMEOUT */ | 19 | #include <linux/sched.h> /* for MAX_SCHEDULE_TIMEOUT */ |
20 | #include <linux/futex.h> /* for FUTEX_WAIT */ | ||
21 | #include <linux/syscalls.h> | 20 | #include <linux/syscalls.h> |
22 | #include <linux/unistd.h> | 21 | #include <linux/unistd.h> |
23 | #include <linux/security.h> | 22 | #include <linux/security.h> |
@@ -239,28 +238,6 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set, | |||
239 | return ret; | 238 | return ret; |
240 | } | 239 | } |
241 | 240 | ||
242 | #ifdef CONFIG_FUTEX | ||
243 | asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, int val, | ||
244 | struct compat_timespec __user *utime, u32 __user *uaddr2, | ||
245 | int val3) | ||
246 | { | ||
247 | struct timespec t; | ||
248 | unsigned long timeout = MAX_SCHEDULE_TIMEOUT; | ||
249 | int val2 = 0; | ||
250 | |||
251 | if ((op == FUTEX_WAIT) && utime) { | ||
252 | if (get_compat_timespec(&t, utime)) | ||
253 | return -EFAULT; | ||
254 | timeout = timespec_to_jiffies(&t) + 1; | ||
255 | } | ||
256 | if (op >= FUTEX_REQUEUE) | ||
257 | val2 = (int) (unsigned long) utime; | ||
258 | |||
259 | return do_futex((unsigned long)uaddr, op, val, timeout, | ||
260 | (unsigned long)uaddr2, val2, val3); | ||
261 | } | ||
262 | #endif | ||
263 | |||
264 | asmlinkage long compat_sys_setrlimit(unsigned int resource, | 241 | asmlinkage long compat_sys_setrlimit(unsigned int resource, |
265 | struct compat_rlimit __user *rlim) | 242 | struct compat_rlimit __user *rlim) |
266 | { | 243 | { |