diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-18 09:52:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-28 05:38:31 -0800 |
| commit | 626fa974dd746c7f25e864f2555e6a7ed0c7e8e8 (patch) | |
| tree | a558b16e9d692067bcf122d0ce1a1707e57d853e /kernel | |
| parent | f12993e9c6723b3507239b4c4358348e0b182304 (diff) | |
futex: Revert "futex: Mark get_robust_list as deprecated"
commit fe2b05f7ca9f906be61dced5489f63b8b4d7c770 upstream.
This reverts commit ec0c4274e33c0373e476b73e01995c53128f1257.
get_robust_list() is in use and a removal would break existing user
space. With the permission checks in place it's not longer a security
hole. Remove the deprecation warnings.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: akpm@linux-foundation.org
Cc: paul.gortmaker@windriver.com
Cc: davej@redhat.com
Cc: keescook@chromium.org
Cc: ebiederm@xmission.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 2 | ||||
| -rw-r--r-- | kernel/futex_compat.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 19eb089ca00..887943044d4 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2471,8 +2471,6 @@ SYSCALL_DEFINE3(get_robust_list, int, pid, if (!futex_cmpxchg_enabled) return -ENOSYS; - WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n"); - rcu_read_lock(); ret = -ESRCH; diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index 83e368b005f..a9642d52863 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c @@ -142,8 +142,6 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, if (!futex_cmpxchg_enabled) return -ENOSYS; - WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n"); - rcu_read_lock(); ret = -ESRCH; |