From 44e24f85674dcfb6023a13d5e21cd8c8f9812398 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 21 May 2012 12:03:32 +0200 Subject: [PATCH] x86: don't call generic_identify() redundantly Right before calling struct cpu_dev's ->c_identify, if non-NULL, identify_cpu() calls generic_identify(). Hence there's no point for ->c_identify to point to generic_identify, nor for the handler to call that function. After removing all pointless uses, the function isn't being used outside the file that's defininig it anymore, and hence can become static. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/amd.c | 1 - xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/cpu/cpu.h | 2 -- xen/arch/x86/cpu/cyrix.c | 2 -- xen/arch/x86/cpu/intel.c | 1 - xen/arch/x86/cpu/transmeta.c | 1 - 6 files changed, 1 insertion(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 5b245264a9..9558d692e3 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -516,7 +516,6 @@ static struct cpu_dev amd_cpu_dev __cpuinitdata = { .c_vendor = "AMD", .c_ident = { "AuthenticAMD" }, .c_init = init_amd, - .c_identify = generic_identify, }; int __init amd_init_cpu(void) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index cc836243a1..186863d131 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -227,7 +227,7 @@ static void __init early_cpu_detect(void) c->x86_capability[4] = cap4; } -void __cpuinit generic_identify(struct cpuinfo_x86 * c) +static void __cpuinit generic_identify(struct cpuinfo_x86 *c) { u32 tfms, xlvl, capability, excap, ebx; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 16e99ea366..e0ed6209c4 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -28,6 +28,4 @@ extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; extern int get_model_name(struct cpuinfo_x86 *c); extern void display_cacheinfo(struct cpuinfo_x86 *c); -extern void generic_identify(struct cpuinfo_x86 * c); - extern void early_intel_workaround(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/cyrix.c b/xen/arch/x86/cpu/cyrix.c index e33eb70e56..3f538c127c 100644 --- a/xen/arch/x86/cpu/cyrix.c +++ b/xen/arch/x86/cpu/cyrix.c @@ -288,7 +288,6 @@ static struct cpu_dev cyrix_cpu_dev __cpuinitdata = { .c_vendor = "Cyrix", .c_ident = { "CyrixInstead" }, .c_init = init_cyrix, - .c_identify = generic_identify, }; int __init cyrix_init_cpu(void) @@ -303,7 +302,6 @@ static struct cpu_dev nsc_cpu_dev __cpuinitdata = { .c_vendor = "NSC", .c_ident = { "Geode by NSC" }, .c_init = init_cyrix, - .c_identify = generic_identify, }; int __init nsc_init_cpu(void) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index a0d47e6f4d..5633c07854 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -329,7 +329,6 @@ static struct cpu_dev intel_cpu_dev __cpuinitdata = { }, }, .c_init = init_intel, - .c_identify = generic_identify, .c_size_cache = intel_size_cache, }; diff --git a/xen/arch/x86/cpu/transmeta.c b/xen/arch/x86/cpu/transmeta.c index 4161764cb9..493a02a587 100644 --- a/xen/arch/x86/cpu/transmeta.c +++ b/xen/arch/x86/cpu/transmeta.c @@ -82,7 +82,6 @@ static void __init init_transmeta(struct cpuinfo_x86 *c) static void transmeta_identify(struct cpuinfo_x86 * c) { u32 xlvl; - generic_identify(c); /* Transmeta-defined flags: level 0x80860001 */ xlvl = cpuid_eax(0x80860000); -- 2.39.5