diff options
| author | Linus Torvalds | 2005-11-15 04:56:02 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2005-11-15 04:56:02 +0100 |
| commit | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (patch) | |
| tree | 980297c1747ca89354bc879cc5d17903eacb19e2 /include/asm-i386/processor.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| parent | [PATCH] x86_64: Fix sparse mem (diff) | |
| download | kernel-qcow2-linux-4060994c3e337b40e0f6fa8ce2cc178e021baf3d.tar.gz kernel-qcow2-linux-4060994c3e337b40e0f6fa8ce2cc178e021baf3d.tar.xz kernel-qcow2-linux-4060994c3e337b40e0f6fa8ce2cc178e021baf3d.zip | |
Merge x86-64 update from Andi
Diffstat (limited to 'include/asm-i386/processor.h')
| -rw-r--r-- | include/asm-i386/processor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 8c02b0318703..5c96cf6dcb39 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h @@ -65,7 +65,9 @@ struct cpuinfo_x86 { int f00f_bug; int coma_bug; unsigned long loops_per_jiffy; - unsigned char x86_num_cores; + unsigned char x86_max_cores; /* cpuid returned max cores value */ + unsigned char booted_cores; /* number of cores as seen by OS */ + unsigned char apicid; } __attribute__((__aligned__(SMP_CACHE_BYTES))); #define X86_VENDOR_INTEL 0 |