cgroup: remove bind() method from cgroup_subsys.

[firefly-linux-kernel-4.4.55.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 9618b6e9fb367b2881ca2ccd28d88f46858e346d..f0090a993dab1e3d43fd202e05bd904aefc05f2a 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -226,7 +226,7 @@ static void drop_futex_key_refs(union futex_key *key)
  * Returns a negative error code or 0
  * The key words are stored in *key on success.
  *
- * For shared mappings, it's (page->index, vma->vm_file->f_path.dentry->d_inode,
+ * For shared mappings, it's (page->index, file_inode(vma->vm_file),
  * offset_within_page).  For private mappings, it's (uaddr, current->mm).
  * We can usually work out the index without swapping in the page.
  *
@@ -2472,8 +2472,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;