1 files changed, 6 insertions, 0 deletions

diff --git a/kernel/params.c b/kernel/params.c
index f406655d6653..718945da8f58 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -143,9 +143,15 @@ int parse_args(const char *name,
 
         while (*args) {
                 int ret;
+                int irq_was_disabled;
 
                 args = next_arg(args, &param, &val);
+                irq_was_disabled = irqs_disabled();
                 ret = parse_one(param, val, params, num, unknown);
+                if (irq_was_disabled && !irqs_disabled()) {
+                        printk(KERN_WARNING "parse_args(): option '%s' enabled "
+                                        "irq's!\n", param);
+                }
                 switch (ret) {
                 case -ENOENT:
                         printk(KERN_ERR "%s: Unknown parameter `%s'\n",