diff options
| author | Simon Horman <horms@verge.net.au> | 2008-09-10 09:14:52 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-10 09:14:52 +1000 |
| commit | c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24 (patch) | |
| tree | 1202d018129ca5538cd98b1e4542b239045c1a2d /arch/x86/kernel/cpu/centaur.c | |
| parent | e9c0ce232e7a36daae1ca08282609d7f0c57c567 (diff) | |
| parent | 28faa979746b2352cd78a376bf9f52db953bda46 (diff) | |
| download | kernel_samsung_aries-c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24.zip kernel_samsung_aries-c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24.tar.gz kernel_samsung_aries-c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'arch/x86/kernel/cpu/centaur.c')
| -rw-r--r-- | arch/x86/kernel/cpu/centaur.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c index e0f45ed..a0534c0 100644 --- a/arch/x86/kernel/cpu/centaur.c +++ b/arch/x86/kernel/cpu/centaur.c @@ -314,6 +314,16 @@ enum { EAMD3D = 1<<20, }; +static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c) +{ + switch (c->x86) { + case 5: + /* Emulate MTRRs using Centaur's MCR. */ + set_cpu_cap(c, X86_FEATURE_CENTAUR_MCR); + break; + } +} + static void __cpuinit init_centaur(struct cpuinfo_x86 *c) { @@ -462,6 +472,7 @@ centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size) static struct cpu_dev centaur_cpu_dev __cpuinitdata = { .c_vendor = "Centaur", .c_ident = { "CentaurHauls" }, + .c_early_init = early_init_centaur, .c_init = init_centaur, .c_size_cache = centaur_size_cache, }; |