Merge branch 'x86/urgent' into x86/core
[linux-2.6] / arch / x86 / kernel / cpu / centaur_64.c
1 #include <linux/init.h>
2 #include <linux/smp.h>
3
4 #include <asm/cpufeature.h>
5 #include <asm/processor.h>
6
7 #include "cpu.h"
8
9 static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)
10 {
11         if (c->x86 == 0x6 && c->x86_model >= 0xf)
12                 set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
13
14         set_cpu_cap(c, X86_FEATURE_SYSENTER32);
15 }
16
17 static void __cpuinit init_centaur(struct cpuinfo_x86 *c)
18 {
19         early_init_centaur(c);
20
21         if (c->x86 == 0x6 && c->x86_model >= 0xf) {
22                 c->x86_cache_alignment = c->x86_clflush_size * 2;
23                 set_cpu_cap(c, X86_FEATURE_REP_GOOD);
24         }
25         set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
26 }
27
28 static struct cpu_dev centaur_cpu_dev __cpuinitdata = {
29         .c_vendor       = "Centaur",
30         .c_ident        = { "CentaurHauls" },
31         .c_early_init   = early_init_centaur,
32         .c_init         = init_centaur,
33         .c_x86_vendor   = X86_VENDOR_CENTAUR,
34 };
35
36 cpu_dev_register(centaur_cpu_dev);
37