Merge branch 'linus' into x86/memory-corruption-check

[linux-2.6-omap-h63xx.git] / arch / x86 / lib / strstr_32.c

diff --git a/arch/x86/lib/strstr_32.c b/arch/x86/lib/strstr_32.c
index a3dafbf59daecb6fe9a8d27ea8bc44748a332708..8e2d55f754bff8f7f221cdb96b0c01c2352f32fa 100644 (file)
--- a/arch/x86/lib/strstr_32.c
+++ b/arch/x86/lib/strstr_32.c
@@ -1,9 +1,9 @@
 #include <linux/string.h>
 
-char * strstr(const char * cs,const char * ct)
+char *strstr(const char *cs, const char *ct)
 {
 int    d0, d1;
-register char * __res;
+register char *__res;
 __asm__ __volatile__(
        "movl %6,%%edi\n\t"
        "repne\n\t"
@@ -23,9 +23,9 @@ __asm__ __volatile__(
        "jne 1b\n\t"
        "xorl %%eax,%%eax\n\t"
        "2:"
-       :"=a" (__res), "=&c" (d0), "=&S" (d1)
-       :"0" (0), "1" (0xffffffff), "2" (cs), "g" (ct)
-       :"dx", "di");
+       : "=a" (__res), "=&c" (d0), "=&S" (d1)
+       : "0" (0), "1" (0xffffffff), "2" (cs), "g" (ct)
+       : "dx", "di");
 return __res;
 }