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>

diff --git a/kernel/futex.c b/kernel/futex.c
index 19eb089ca003a7f7a09347eb393d5241cc93342e..887943044d46781a27041636f389e54e0358db20 100644 (file)
--- 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 83e368b005fc6eb001a2babe7a48d80dcb21037e..a9642d528630260749f760f3c02bc8164f51af2b 100644 (file)
--- 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;