From 6f134cc2751846c7fb64e8862dfe8d57185872af Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 23 May 2006 14:54:58 +0000 Subject: nginx-0.3.47-RELEASE import *) Feature: the "upstream" directive. *) Change: now the "\" escape symbol in the "\"" and "\'" pairs in the SSI command is always removed. --- src/core/ngx_cpuinfo.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/core/ngx_cpuinfo.c') 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" ); } -- cgit