diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:20 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:20 +0200 |
commit | f12e6a451aad671a724e61abce2b8b323f209355 (patch) | |
tree | e4969282d07f7682099291e59545744b3bb5dcac /arch/x86/lib/strstr_32.c | |
parent | 046fd53773cd87125f799b00422e487bf1428d38 (diff) | |
parent | dc44e65943169de2d1a1b494876f48a65a9737f1 (diff) |
Merge branch 'x86/cleanups' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lib/strstr_32.c')
-rw-r--r-- | arch/x86/lib/strstr_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/strstr_32.c b/arch/x86/lib/strstr_32.c index 42e8a50303f..8e2d55f754b 100644 --- a/arch/x86/lib/strstr_32.c +++ b/arch/x86/lib/strstr_32.c @@ -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; } |