diff --git a/[refs] b/[refs] index d8b23fcc780e..c1741d086e14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5042afe7fe32390e79910ecd0a1f0563d4bca38c +refs/heads/master: fe2b05f7ca9f906be61dced5489f63b8b4d7c770 diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index 19eb089ca003..887943044d46 100644 --- a/trunk/kernel/futex.c +++ b/trunk/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/trunk/kernel/futex_compat.c b/trunk/kernel/futex_compat.c index 83e368b005fc..a9642d528630 100644 --- a/trunk/kernel/futex_compat.c +++ b/trunk/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;