x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
PATCH 1/1 x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
display_cacheinfo() doesn't display anything anymore and it is solely used to detect CPU cache sizes for /proc/cpuinfo. Rename it accordingly.
--- 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(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -535,7 +535,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) } } -display_cacheinfo (c); +cpu_detect_cache_sizes (c);/* Multi core CPU? */ if (c->extended_cpuid_level >=0x80000008 ) {
arch/x86/kernel/cpu/centaur.c +1 -1
@@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_REP_GOOD ); } -display_cacheinfo (c); +cpu_detect_cache_sizes (c); }enum {
arch/x86/kernel/cpu/common.c +2 -2
@@ -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(struct cpuinfo_x86 *c) } } -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;
arch/x86/kernel/cpu/cpu.h +1 -1
@@ -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
arch/x86/kernel/cpu/cyrix.c +1 -1
@@ -373,7 +373,7 @@ static void __cpuinit init_nsc(struct cpuinfo_x86 *c)/* 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); }
arch/x86/kernel/cpu/transmeta.c +1 -1
@@ -26,7 +26,7 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)early_init_transmeta (c); -display_cacheinfo (c); +cpu_detect_cache_sizes (c);/* Print CMS and CPU revision */ max =cpuid_eax (0x80860000 );
Signature · 1 line
1.6.5
Quoted 3 lines · Borislav Petkov
display_cacheinfo()doesn't display anything anymore and it is solely
used to detect CPU cache sizes for/proc/cpuinfo. Rename it accordingly.
Hi Borislav,
If it is only displays cache sizes for /proc/cpuinfo, then we need to check #ifdef CONFIG_PROC_FS , isn't it?
Quoted 106 lines
Signed-off-by Borislav Petkov <[email protected]>---
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(-)diff --git
a/arch/x86/kernel/cpu/amd.cb/arch/x86/kernel/cpu/amd.cindex c910a71..7128b37 100644
---a/arch/x86/kernel/cpu/amd.c
+++b/arch/x86/kernel/cpu/amd.c
@@ -535,7 +535,7 @@ static void__cpuinitinit_amd(struct cpuinfo_x86 *c)} }-
display_cacheinfo(c);
+cpu_detect_cache_sizes(c);/* Multi core CPU? */ if (c->extended_cpuid_level >= 0x80000008) { diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c index c95e831..e58d978 100644 --- a/arch/x86/kernel/cpu/centaur.c +++ b/arch/x86/kernel/cpu/centaur.c @@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c) set_cpu_cap(c, X86_FEATURE_REP_GOOD); }-
display_cacheinfo(c);
+cpu_detect_cache_sizes(c);
}enum {
diff --gita/arch/x86/kernel/cpu/common.cb/arch/x86/kernel/cpu/common.cindex 61242a5..9bf845d 100644
---a/arch/x86/kernel/cpu/common.c
+++b/arch/x86/kernel/cpu/common.c
@@ -61,7 +61,7 @@ void__initsetup_cpu_local_masks(void)
static void__cpuinitdefault_init(struct cpuinfo_x86 *c)
{
#ifdefCONFIG_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(struct cpuinfo_x86 *c) }}
-void
__cpuinitdisplay_cacheinfo(struct cpuinfo_x86 *c)+void__cpuinitcpu_detect_cache_sizes(struct cpuinfo_x86 *c){ unsigned int n, dummy, ebx, ecx, edx, l2size;diff --git
a/arch/x86/kernel/cpu/cpu.hb/arch/x86/kernel/cpu/cpu.hindex 6de9a90..3624e8a 100644
---a/arch/x86/kernel/cpu/cpu.h
+++b/arch/x86/kernel/cpu/cpu.h
@@ -32,6 +32,6 @@ structcpu_dev{
extern const structcpu_dev*const __x86_cpu_dev_start[],*const __x86_cpu_dev_end[];-extern void
display_cacheinfo(struct cpuinfo_x86 *c); +extern voidcpu_detect_cache_sizes(struct cpuinfo_x86 *c);#endif
diff --gita/arch/x86/kernel/cpu/cyrix.cb/arch/x86/kernel/cpu/cyrix.cindex 19807b8..4fbd384 100644
---a/arch/x86/kernel/cpu/cyrix.c
+++b/arch/x86/kernel/cpu/cyrix.c
@@ -373,7 +373,7 @@ static void__cpuinitinit_nsc(struct cpuinfo_x86 *c)/* 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);}
diff --gita/arch/x86/kernel/cpu/transmeta.cb/arch/x86/kernel/cpu/transmeta.cindex bb62b3e..2800074 100644
---a/arch/x86/kernel/cpu/transmeta.c
+++b/arch/x86/kernel/cpu/transmeta.c
@@ -26,7 +26,7 @@ static void__cpuinitinit_transmeta(struct cpuinfo_x86 *c)early_init_transmeta(c);-
display_cacheinfo(c);
+cpu_detect_cache_sizes(c);/* Print CMS and CPU revision */ max = cpuid_eax(0x80860000);--
1.6.5--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Hi Rakib,
Quoted 4 lines · Rakib Mullick
Quoted 2 lines
display_cacheinfo()doesn't display anything anymore and it is solely
used to detect CPU cache sizes for/proc/cpuinfo. Rename it accordingly.If it is only displays cache sizes for
/proc/cpuinfo, then we need to check #ifdefCONFIG_PROC_FS, isn't it?
well, I was grepping for all the places where c->x86_cache_size and c->x86_tlbsize are being used and have missed the location arch/x86/kernel/cpu/intel_cacheinfo.c:amd_cpuid4() where current_cpu_data.x86_cache_size is being read so we can't make it dependent on PROC_FS.
Sorry for misleading you, here's a corrected version:
--
From: Borislav Petkov <[email protected]>
Date: Wed, 18 Nov 2009 19:01:28 +0100
Subject: [PATCH] x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
display_cacheinfo() doesn't display anything anymore and it is used to detect CPU cache sizes. Rename it accordingly.
--- 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(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -535,7 +535,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) } } -display_cacheinfo (c); +cpu_detect_cache_sizes (c);/* Multi core CPU? */ if (c->extended_cpuid_level >=0x80000008 ) {
arch/x86/kernel/cpu/centaur.c +1 -1
@@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_REP_GOOD ); } -display_cacheinfo (c); +cpu_detect_cache_sizes (c); }enum {
arch/x86/kernel/cpu/common.c +2 -2
@@ -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(struct cpuinfo_x86 *c) } } -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;
arch/x86/kernel/cpu/cpu.h +1 -1
@@ -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
arch/x86/kernel/cpu/cyrix.c +1 -1
@@ -373,7 +373,7 @@ static void __cpuinit init_nsc(struct cpuinfo_x86 *c)/* 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); }
arch/x86/kernel/cpu/transmeta.c +1 -1
@@ -26,7 +26,7 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)early_init_transmeta (c); -display_cacheinfo (c); +cpu_detect_cache_sizes (c);/* Print CMS and CPU revision */ max =cpuid_eax (0x80860000 );
Signature · 5 lines
1.6.5
--
Regards/Gruss,
Boris.Commit-ID: 27c13ecec4d8856687b50b959e1146845b478f95 Gitweb: http://git.kernel.org/tip/27c13ecec4d8856687b50b959e1146845b478f95 Author: Borislav Petkov <[email protected]> AuthorDate: Sat, 21 Nov 2009 14:01:45 +0100 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 23 Nov 2009 11:59:53 -0800
x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
display_cacheinfo() doesn't display anything anymore and it is used to detect CPU cache sizes. Rename it accordingly.
LKML-Reference: <[email protected]>
--- 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(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -535,7 +535,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) } } -display_cacheinfo (c); +cpu_detect_cache_sizes (c);/* Multi core CPU? */ if (c->extended_cpuid_level >=0x80000008 ) {
arch/x86/kernel/cpu/centaur.c +1 -1
@@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_REP_GOOD ); } -display_cacheinfo (c); +cpu_detect_cache_sizes (c); }enum {
arch/x86/kernel/cpu/common.c +2 -2
@@ -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(struct cpuinfo_x86 *c) } } -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;
arch/x86/kernel/cpu/cpu.h +1 -1
@@ -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
arch/x86/kernel/cpu/cyrix.c +1 -1
@@ -373,7 +373,7 @@ static void __cpuinit init_nsc(struct cpuinfo_x86 *c)/* 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); }
arch/x86/kernel/cpu/transmeta.c +1 -1
@@ -26,7 +26,7 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)early_init_transmeta (c); -display_cacheinfo (c); +cpu_detect_cache_sizes (c);/* Print CMS and CPU revision */ max =cpuid_eax (0x80860000 );