From f8e7ef1953f26ba0cf73ea0750cb5897312302e2 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Mon, 10 Oct 2011 00:03:37 +0200
Subject: [PATCH] --- yaml --- r: 267257 b: refs/heads/master c:
 b1e4d20cbf2ef8e27515da032b95fdcbb5b06bf1 h: refs/heads/master i:   267255:
 bc50e50aee18e794ec841e4839082c3774b8d9d1 v: v3

---
 [refs]                            |  2 +-
 trunk/include/linux/moduleparam.h | 20 ++++++++++++++++++++
 trunk/init/main.c                 |  4 ++--
 trunk/kernel/params.c             | 21 ++++++++++++++-------
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6fb9366c68da..24074ba4b299 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37252db6aa576c34fd794a5a54fb32d7a8b3a07a
+refs/heads/master: b1e4d20cbf2ef8e27515da032b95fdcbb5b06bf1
diff --git a/trunk/include/linux/moduleparam.h b/trunk/include/linux/moduleparam.h
index ddaae98c53f9..fffb10bd5514 100644
--- a/trunk/include/linux/moduleparam.h
+++ b/trunk/include/linux/moduleparam.h
@@ -262,6 +262,26 @@ static inline void __kernel_param_unlock(void)
 			    .str = &__param_string_##name, 0, perm);	\
 	__MODULE_PARM_TYPE(name, "string")
 
+/**
+ * parameq - checks if two parameter names match
+ * @name1: parameter name 1
+ * @name2: parameter name 2
+ *
+ * Returns true if the two parameter names are equal.
+ * Dashes (-) are considered equal to underscores (_).
+ */
+extern bool parameq(const char *name1, const char *name2);
+
+/**
+ * parameqn - checks if two parameter names match
+ * @name1: parameter name 1
+ * @name2: parameter name 2
+ * @n: the length to compare
+ *
+ * Similar to parameq(), except it compares @n characters.
+ */
+extern bool parameqn(const char *name1, const char *name2, size_t n);
+
 /* Called on module insert or kernel boot */
 extern int parse_args(const char *name,
 		      char *args,
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 03b408dff825..63f5f6f8dc3b 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -163,7 +163,7 @@ static int __init obsolete_checksetup(char *line)
 	p = __setup_start;
 	do {
 		int n = strlen(p->str);
-		if (!strncmp(line, p->str, n)) {
+		if (parameqn(line, p->str, n)) {
 			if (p->early) {
 				/* Already done in parse_early_param?
 				 * (Needs exact match on param part).
@@ -392,7 +392,7 @@ static int __init do_early_param(char *param, char *val)
 	const struct obs_kernel_param *p;
 
 	for (p = __setup_start; p < __setup_end; p++) {
-		if ((p->early && strcmp(param, p->str) == 0) ||
+		if ((p->early && parameq(param, p->str)) ||
 		    (strcmp(param, "console") == 0 &&
 		     strcmp(p->str, "earlycon") == 0)
 		) {
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index 22df3e0d142a..821788947e40 100644
--- a/trunk/kernel/params.c
+++ b/trunk/kernel/params.c
@@ -67,20 +67,27 @@ static void maybe_kfree_parameter(void *param)
 	}
 }
 
-static inline char dash2underscore(char c)
+static char dash2underscore(char c)
 {
 	if (c == '-')
 		return '_';
 	return c;
 }
 
-static inline int parameq(const char *input, const char *paramname)
+bool parameqn(const char *a, const char *b, size_t n)
 {
-	unsigned int i;
-	for (i = 0; dash2underscore(input[i]) == paramname[i]; i++)
-		if (input[i] == '\0')
-			return 1;
-	return 0;
+	size_t i;
+
+	for (i = 0; i < n; i++) {
+		if (dash2underscore(a[i]) != dash2underscore(b[i]))
+			return false;
+	}
+	return true;
+}
+
+bool parameq(const char *a, const char *b)
+{
+	return parameqn(a, b, strlen(a)+1);
 }
 
 static int parse_one(char *param,