---

yaml --- r: 307591 b: refs/heads/master c: b2d6aba h: refs/heads/master i: 307589: e8d3c96 307587: 7860d17 307583: 08677e7 v: v3
git-mirror · May 7, 2012 · 662dd3e · 662dd3e
1 parent 92131a2
commit 662dd3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 396e2c6fed4ff13b53ce0e573105531cf53b0cad
+refs/heads/master: b2d6aba9657c7e3d027dd43ac7d7c405e0079d46
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c
@@ -94,13 +94,18 @@ static int hpet_verbose;
 
 static int __init hpet_setup(char *str)
 {
-	if (str) {
+	while (str) {
+		char *next = strchr(str, ',');
+
+		if (next)
+			*next++ = 0;
 		if (!strncmp("disable", str, 7))
 			boot_hpet_disable = 1;
 		if (!strncmp("force", str, 5))
 			hpet_force_user = 1;
 		if (!strncmp("verbose", str, 7))
 			hpet_verbose = 1;
+		str = next;
 	}
 	return 1;
 }