diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/x86/kernel/cpu/transmeta.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/x86/kernel/cpu/transmeta.c')
| -rw-r--r-- | arch/x86/kernel/cpu/transmeta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c index bb62b3e5caa..28000743bbb 100644 --- a/arch/x86/kernel/cpu/transmeta.c +++ b/arch/x86/kernel/cpu/transmeta.c | |||
| @@ -26,7 +26,7 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c) | |||
| 26 | 26 | ||
| 27 | early_init_transmeta(c); | 27 | early_init_transmeta(c); |
| 28 | 28 | ||
| 29 | display_cacheinfo(c); | 29 | cpu_detect_cache_sizes(c); |
| 30 | 30 | ||
| 31 | /* Print CMS and CPU revision */ | 31 | /* Print CMS and CPU revision */ |
| 32 | max = cpuid_eax(0x80860000); | 32 | max = cpuid_eax(0x80860000); |