2 files changed, 10 insertions, 1 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 709e08e9a222..e458d2b2ae95 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -2,7 +2,14 @@ The following is a list of files and features that are going to be
 removed in the kernel source tree.  Every entry should contain what
 exactly is going away, why it is happening, and who is going to be doing
 the work.  When the feature is removed from the kernel, it should also
-be removed from this file.
+be removed from this file.  The suggested deprecation period is 3 releases.
+
+---------------------------
+
+What:   ddebug_query="query" boot cmdline param
+When:   v3.8
+Why:    obsoleted by dyndbg="query" and module.dyndbg="query"
+Who:    Jim Cromie <jim.cromie@gmail.com>, Jason Baron <jbaron@redhat.com>
 
 ---------------------------
 
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 8fba40179305..09f2cda88058 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -993,6 +993,8 @@ static int __init dynamic_debug_init(void)
 
         /* ddebug_query boot param got passed -> set it up */
         if (ddebug_setup_string[0] != '\0') {
+                pr_warn("ddebug_query param name is deprecated,"
+                        " change it to dyndbg\n");
                 ret = ddebug_exec_queries(ddebug_setup_string);
                 if (ret < 0)
                         pr_warn("Invalid ddebug boot param %s",