Re: [PATCH] x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

[Rakib Mullick <rakib.mullick@gmail.com>]

On 11/21/09, Borislav Petkov <petkovbb@googlemail.com> wrote:
> 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?

>  Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
>  ---
>   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.c b/arch/x86/kernel/cpu/amd.c
>  index c910a71..7128b37 100644
>  --- a/arch/x86/kernel/cpu/amd.c
>  +++ b/arch/x86/kernel/cpu/amd.c
>  @@ -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) {
>  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 --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
>  index 61242a5..9bf845d 100644
>  --- 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(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;
>
>  diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
>  index 6de9a90..3624e8a 100644
>  --- 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
>  diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
>  index 19807b8..4fbd384 100644
>  --- a/arch/x86/kernel/cpu/cyrix.c
>  +++ b/arch/x86/kernel/cpu/cyrix.c
>  @@ -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);
>   }
>  diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
>  index bb62b3e..2800074 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)
>
>         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 majordomo@vger.kernel.org
>  More majordomo info at  http://vger.kernel.org/majordomo-info.html
>  Please read the FAQ at  http://www.tux.org/lkml/
>