diff options
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index a191d4831789..b06221e31952 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
| @@ -855,6 +855,8 @@ static void __init init_intel(struct cpuinfo_x86 *c) | |||
| 855 | 855 | ||
| 856 | if (c->x86 == 15) | 856 | if (c->x86 == 15) |
| 857 | c->x86_cache_alignment = c->x86_clflush_size * 2; | 857 | c->x86_cache_alignment = c->x86_clflush_size * 2; |
| 858 | if (c->x86 >= 15) | ||
| 859 | set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability); | ||
| 858 | } | 860 | } |
| 859 | 861 | ||
| 860 | void __init get_cpu_vendor(struct cpuinfo_x86 *c) | 862 | void __init get_cpu_vendor(struct cpuinfo_x86 *c) |
| @@ -1055,7 +1057,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 1055 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1057 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1056 | 1058 | ||
| 1057 | /* Other (Linux-defined) */ | 1059 | /* Other (Linux-defined) */ |
| 1058 | "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr", NULL, NULL, NULL, NULL, | 1060 | "cxmmx", NULL, "cyrix_arr", "centaur_mcr", "k8c+", |
| 1061 | "constant_tsc", NULL, NULL, | ||
| 1059 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1062 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1060 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1063 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1061 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1064 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |