mirror of
https://abf.rosa.ru/djam/kernel-xen.git
synced 2025-02-23 15:52:46 +00:00
97 lines
2.8 KiB
Diff
97 lines
2.8 KiB
Diff
|
From: Borislav Petkov <petkovbb@googlemail.com>
|
||
|
|
Subject: x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
|
||
|
|
Patch-mainline: 2.6.33-rc1
|
||
|
|
References: bnc#564618, FATE#306952
|
||
|
|
Git-commit: 27c13ecec4d8856687b50b959e1146845b478f95
|
||
|
|
|
||
|
|
display_cacheinfo() doesn't display anything anymore and it is used to
|
||
|
|
detect CPU cache sizes. Rename it accordingly.
|
||
|
|
|
||
|
|
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
|
||
|
|
LKML-Reference: <20091121130145.GA31357@liondog.tnic>
|
||
|
|
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
||
|
|
Signed-off-by: Rafael J. Wysocki <rjw@suse.de>
|
||
|
|
---
|
||
|
|
arch/x86/kernel/cpu/amd.c | 2 +-
|
||
|
|
arch/x86/kernel/cpu/centaur.c | 2 +-
|
||
|
|
arch/x86/kernel/cpu/common.c | 4 ++--
|
||
|
|
arch/x86/kernel/cpu/cpu.h | 2 +-
|
||
|
|
arch/x86/kernel/cpu/cyrix.c | 2 +-
|
||
|
|
arch/x86/kernel/cpu/transmeta.c | 2 +-
|
||
|
|
6 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/x86/kernel/cpu/amd.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/amd.c
|
||
|
|
@@ -535,7 +535,7 @@ static void __cpuinit init_amd(struct cp
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- display_cacheinfo(c);
|
||
|
|
+ cpu_detect_cache_sizes(c);
|
||
|
|
|
||
|
|
/* Multi core CPU? */
|
||
|
|
if (c->extended_cpuid_level >= 0x80000008) {
|
||
|
|
--- a/arch/x86/kernel/cpu/centaur.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/centaur.c
|
||
|
|
@@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpu
|
||
|
|
set_cpu_cap(c, X86_FEATURE_REP_GOOD);
|
||
|
|
}
|
||
|
|
|
||
|
|
- display_cacheinfo(c);
|
||
|
|
+ cpu_detect_cache_sizes(c);
|
||
|
|
}
|
||
|
|
|
||
|
|
enum {
|
||
|
|
--- a/arch/x86/kernel/cpu/common.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/common.c
|
||
|
|
@@ -61,7 +61,7 @@ void __init setup_cpu_local_masks(void)
|
||
|
|
static void __cpuinit default_init(struct cpuinfo_x86 *c)
|
||
|
|
{
|
||
|
|
#ifdef CONFIG_X86_64
|
||
|
|
- display_cacheinfo(c);
|
||
|
|
+ cpu_detect_cache_sizes(c);
|
||
|
|
#else
|
||
|
|
/* Not much we can do here... */
|
||
|
|
/* Check if at least it has cpuid */
|
||
|
|
@@ -383,7 +383,7 @@ static void __cpuinit get_model_name(str
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
|
||
|
|
+void __cpuinit cpu_detect_cache_sizes(struct cpuinfo_x86 *c)
|
||
|
|
{
|
||
|
|
unsigned int n, dummy, ebx, ecx, edx, l2size;
|
||
|
|
|
||
|
|
--- a/arch/x86/kernel/cpu/cpu.h
|
||
|
|
+++ b/arch/x86/kernel/cpu/cpu.h
|
||
|
|
@@ -32,6 +32,6 @@ struct cpu_dev {
|
||
|
|
extern const struct cpu_dev *const __x86_cpu_dev_start[],
|
||
|
|
*const __x86_cpu_dev_end[];
|
||
|
|
|
||
|
|
-extern void display_cacheinfo(struct cpuinfo_x86 *c);
|
||
|
|
+extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
|
||
|
|
|
||
|
|
#endif
|
||
|
|
--- a/arch/x86/kernel/cpu/cyrix.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/cyrix.c
|
||
|
|
@@ -373,7 +373,7 @@ static void __cpuinit init_nsc(struct cp
|
||
|
|
/* Handle the GX (Formally known as the GX2) */
|
||
|
|
|
||
|
|
if (c->x86 == 5 && c->x86_model == 5)
|
||
|
|
- display_cacheinfo(c);
|
||
|
|
+ cpu_detect_cache_sizes(c);
|
||
|
|
else
|
||
|
|
init_cyrix(c);
|
||
|
|
}
|
||
|
|
--- a/arch/x86/kernel/cpu/transmeta.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/transmeta.c
|
||
|
|
@@ -26,7 +26,7 @@ static void __cpuinit init_transmeta(str
|
||
|
|
|
||
|
|
early_init_transmeta(c);
|
||
|
|
|
||
|
|
- display_cacheinfo(c);
|
||
|
|
+ cpu_detect_cache_sizes(c);
|
||
|
|
|
||
|
|
/* Print CMS and CPU revision */
|
||
|
|
max = cpuid_eax(0x80860000);
|