From dc7d0f5c58295739437839e8db77225903aa3efa Mon Sep 17 00:00:00 2001
From: Ard van Breemen <ard@telegraafnet.nl>
Date: Fri, 5 Jan 2007 16:36:20 -0800
Subject: [PATCH] --- yaml --- r: 45231 b: refs/heads/master c:
 a416aba637dcb4127595c02a59041cd278422f7e h: refs/heads/master i:   45229:
 a45ed3cb4bd5a9f5659ba315f45d5483fd386d64   45227:
 3a66c4347588cecacf6ecadd9786573829134d30   45223:
 75f64908a6b691caed17e0b9d63ba55a40603d92   45215:
 446ad210c740c49dd08ced494a8edeb7af63ea59 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/params.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 56d90bcf2462..f74ca6fcf831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4a68306b9c0939b3facdad2cc5e34d660ff463a
+refs/heads/master: a416aba637dcb4127595c02a59041cd278422f7e
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index f406655d6653..718945da8f58 100644
--- a/trunk/kernel/params.c
+++ b/trunk/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",