---

yaml --- r: 277459 b: refs/heads/master c: 890890c h: refs/heads/master i: 277457: 5f66205 277455: 412af8c v: v3
git-mirror · Dec 12, 2011 · 5c4d665 · 5c4d665
1 parent 54bbf5c
commit 5c4d665
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79f1ddd06471b094ae30eb17b33beb9f1234ca93
+refs/heads/master: 890890cb8e415e1e7a61bfe3c8e246f710196824
diff --git a/trunk/arch/x86/lib/string_32.c b/trunk/arch/x86/lib/string_32.c
@@ -164,15 +164,13 @@ EXPORT_SYMBOL(strchr);
 size_t strlen(const char *s)
 {
 	int d0;
-	int res;
+	size_t res;
 	asm volatile("repne\n\t"
-		"scasb\n\t"
-		"notl %0\n\t"
-		"decl %0"
+		"scasb"
 		: "=c" (res), "=&D" (d0)
 		: "1" (s), "a" (0), "0" (0xffffffffu)
 		: "memory");
-	return res;
+	return ~res - 1;
 }
 EXPORT_SYMBOL(strlen);
 #endif