summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/cgroup.c1
-rw-r--r--kernel/module.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f34c41bfaa37..571264830a29 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1333,7 +1333,6 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
1333 if (ret) 1333 if (ret)
1334 goto out_unlock; 1334 goto out_unlock;
1335 1335
1336 /* See feature-removal-schedule.txt */
1337 if (opts.subsys_mask != root->actual_subsys_mask || opts.release_agent) 1336 if (opts.subsys_mask != root->actual_subsys_mask || opts.release_agent)
1338 pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n", 1337 pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
1339 task_tgid_nr(current), current->comm); 1338 task_tgid_nr(current), current->comm);
diff --git a/kernel/module.c b/kernel/module.c
index 6e48c3a43599..808bd62e1723 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -372,9 +372,6 @@ static bool check_symbol(const struct symsearch *syms,
372 printk(KERN_WARNING "Symbol %s is being used " 372 printk(KERN_WARNING "Symbol %s is being used "
373 "by a non-GPL module, which will not " 373 "by a non-GPL module, which will not "
374 "be allowed in the future\n", fsa->name); 374 "be allowed in the future\n", fsa->name);
375 printk(KERN_WARNING "Please see the file "
376 "Documentation/feature-removal-schedule.txt "
377 "in the kernel source tree for more details.\n");
378 } 375 }
379 } 376 }
380 377