aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2011-10-09 18:03:37 -0400
committerRusty Russell <rusty@rustcorp.com.au>2011-10-25 22:40:39 -0400
commitb1e4d20cbf2ef8e27515da032b95fdcbb5b06bf1 (patch)
treef080e839635fa36f55d22d147baa12ae64d4c181 /init/main.c
parent37252db6aa576c34fd794a5a54fb32d7a8b3a07a (diff)
params: make dashes and underscores in parameter names truly equal
The user may use "foo-bar" for a kernel parameter defined as "foo_bar". Make sure it works the other way around too. Apply the equality of dashes and underscores on early_params and __setup params as well. The example given in Documentation/kernel-parameters.txt indicates that this is the intended behaviour. With the patch the kernel accepts "log-buf-len=1M" as expected. https://bugzilla.redhat.com/show_bug.cgi?id=744545 Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (neatened implementations)
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index 03b408dff825..63f5f6f8dc3b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -163,7 +163,7 @@ static int __init obsolete_checksetup(char *line)
163 p = __setup_start; 163 p = __setup_start;
164 do { 164 do {
165 int n = strlen(p->str); 165 int n = strlen(p->str);
166 if (!strncmp(line, p->str, n)) { 166 if (parameqn(line, p->str, n)) {
167 if (p->early) { 167 if (p->early) {
168 /* Already done in parse_early_param? 168 /* Already done in parse_early_param?
169 * (Needs exact match on param part). 169 * (Needs exact match on param part).
@@ -392,7 +392,7 @@ static int __init do_early_param(char *param, char *val)
392 const struct obs_kernel_param *p; 392 const struct obs_kernel_param *p;
393 393
394 for (p = __setup_start; p < __setup_end; p++) { 394 for (p = __setup_start; p < __setup_end; p++) {
395 if ((p->early && strcmp(param, p->str) == 0) || 395 if ((p->early && parameq(param, p->str)) ||
396 (strcmp(param, "console") == 0 && 396 (strcmp(param, "console") == 0 &&
397 strcmp(p->str, "earlycon") == 0) 397 strcmp(p->str, "earlycon") == 0)
398 ) { 398 ) {