releases/3.7.10/futex-revert-futex-mark-get_robust_list-as-deprecated.patch

   1 From fe2b05f7ca9f906be61dced5489f63b8b4d7c770 Mon Sep 17 00:00:00 2001
   2 From: Thomas Gleixner <tglx@linutronix.de>
   3 Date: Mon, 18 Feb 2013 09:52:08 +0100
   4 Subject: futex: Revert "futex: Mark get_robust_list as deprecated"
   5
   6 From: Thomas Gleixner <tglx@linutronix.de>
   7
   8 commit fe2b05f7ca9f906be61dced5489f63b8b4d7c770 upstream.
   9
  10 This reverts commit ec0c4274e33c0373e476b73e01995c53128f1257.
  11
  12 get_robust_list() is in use and a removal would break existing user
  13 space. With the permission checks in place it's not longer a security
  14 hole. Remove the deprecation warnings.
  15
  16 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  17 Cc: Cyrill Gorcunov <gorcunov@openvz.org>
  18 Cc: Richard Weinberger <richard@nod.at>
  19 Cc: akpm@linux-foundation.org
  20 Cc: paul.gortmaker@windriver.com
  21 Cc: davej@redhat.com
  22 Cc: keescook@chromium.org
  23 Cc: ebiederm@xmission.com
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25
  26 ---
  27  kernel/futex.c        |    2 --
  28  kernel/futex_compat.c |    2 --
  29  2 files changed, 4 deletions(-)
  30
  31 --- a/kernel/futex.c
  32 +++ b/kernel/futex.c
  33 @@ -2471,8 +2471,6 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
  34         if (!futex_cmpxchg_enabled)
  35                 return -ENOSYS;
  36
  37 -       WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
  38 -
  39         rcu_read_lock();
  40
  41         ret = -ESRCH;
  42 --- a/kernel/futex_compat.c
  43 +++ b/kernel/futex_compat.c
  44 @@ -142,8 +142,6 @@ compat_sys_get_robust_list(int pid, comp
  45         if (!futex_cmpxchg_enabled)
  46                 return -ENOSYS;
  47
  48 -       WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
  49 -
  50         rcu_read_lock();
  51
  52         ret = -ESRCH;