diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-05-23 18:54:58 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-05-23 18:54:58 +0400 |
commit | 6f134cc2751846c7fb64e8862dfe8d57185872af (patch) | |
tree | dc9bb5e6acdc1bc5355539a9d7f73c01c83b09c3 /src/core/ngx_cpuinfo.c | |
parent | e425c20bbe6b401f1f816fded996543212e08b0c (diff) |
nginx-0.3.47-RELEASE importrelease-0.3.47
*) Feature: the "upstream" directive.
*) Change: now the "\" escape symbol in the "\"" and "\'" pairs in the
SSI command is always removed.
Diffstat (limited to 'src/core/ngx_cpuinfo.c')
-rw-r--r-- | src/core/ngx_cpuinfo.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/ngx_cpuinfo.c b/src/core/ngx_cpuinfo.c index f905cbc13..2ed26b8d4 100644 --- a/src/core/ngx_cpuinfo.c +++ b/src/core/ngx_cpuinfo.c @@ -31,16 +31,14 @@ ngx_cpuid(uint32_t i, uint32_t *buf) " mov %%ebx, %%esi; " " cpuid; " - " mov %%eax, %0; " - " mov %%ebx, %1; " - " mov %%edx, %2; " - " mov %%ecx, %3; " + " mov %%eax, (%1); " + " mov %%ebx, 4(%1); " + " mov %%edx, 8(%1); " + " mov %%ecx, 12(%1); " " mov %%esi, %%ebx; " - : "=m" (buf[0]), "=m" (buf[1]), "=m" (buf[2]), "=m" (buf[3]) - : "a" (i) - : "ecx", "edx", "esi" ); + : : "a" (i), "D" (buf) : "ecx", "edx", "esi", "memory" ); } |