diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:02:06 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:02:06 +0000 |
| commit | 0919207d9fbacacc917d99d024148e22f2668901 (patch) | |
| tree | 21f9ac8abca598bf73c706f057edc11fd300acf4 | |
| parent | 6e574b051840946aedbdda548f2b0e4bd54f4b9c (diff) | |
| download | nginx-0919207d9fbacacc917d99d024148e22f2668901.tar.gz nginx-0919207d9fbacacc917d99d024148e22f2668901.zip | |
r2614 merge:
update cpuid for Core 2 and Atom
| -rw-r--r-- | src/core/ngx_cpuinfo.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/ngx_cpuinfo.c b/src/core/ngx_cpuinfo.c index 68eb094c9..39a6b05a0 100644 --- a/src/core/ngx_cpuinfo.c +++ b/src/core/ngx_cpuinfo.c @@ -72,7 +72,7 @@ void ngx_cpuinfo(void) { u_char *vendor; - uint32_t vbuf[5], cpu[4]; + uint32_t vbuf[5], cpu[4], model; vbuf[0] = 0; vbuf[1] = 0; @@ -103,8 +103,10 @@ ngx_cpuinfo(void) case 6: ngx_cacheline_size = 32; - if ((cpu[0] & 0xf0) >= 0xd0) { - /* Intel Core */ + model = ((cpu[0] & 0xf0000) >> 8) | (cpu[0] & 0xf0); + + if (model >= 0xd0) { + /* Intel Core, Core 2, Atom */ ngx_cacheline_size = 64; } |