diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:21:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:21:21 -0400 |
| commit | 9042763808c5285a1a61b45b0fe98a710a4c903c (patch) | |
| tree | 349be736a3b56a64c8835df03f127959bfc6e0e0 /include/asm-x86/processor.h | |
| parent | 446d27338d3b422dd3dfe496d0f362230994d059 (diff) | |
| parent | aa3341a168883654d1b13f5931c5ed2762537831 (diff) | |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
arch/x86/kernel/cpu/common_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/processor.h')
| -rw-r--r-- | include/asm-x86/processor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index ae5bd1abe766..bbbbe1fc5ce1 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
| @@ -165,6 +165,7 @@ extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c); | |||
| 165 | extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); | 165 | extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); |
| 166 | extern unsigned short num_cache_leaves; | 166 | extern unsigned short num_cache_leaves; |
| 167 | 167 | ||
| 168 | extern void detect_extended_topology(struct cpuinfo_x86 *c); | ||
| 168 | #if defined(CONFIG_X86_HT) || defined(CONFIG_X86_64) | 169 | #if defined(CONFIG_X86_HT) || defined(CONFIG_X86_64) |
| 169 | extern void detect_ht(struct cpuinfo_x86 *c); | 170 | extern void detect_ht(struct cpuinfo_x86 *c); |
| 170 | #else | 171 | #else |