1 files changed, 3 insertions, 5 deletions

diff --git a/arch/x86/lib/string_32.c b/arch/x86/lib/string_32.c
index 82004d2bf05e..bd59090825db 100644
--- a/arch/x86/lib/string_32.c
+++ b/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