From: Kumar Gala Remove initializations to zero in cpu_specs table at Tom Rini's suggestion. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton --- 25-akpm/arch/ppc/kernel/cputable.c | 47 ------------------------------------- 1 files changed, 47 deletions(-) diff -puN arch/ppc/kernel/cputable.c~ppc32-remove-zero-initializations-in-cpu_specs arch/ppc/kernel/cputable.c --- 25/arch/ppc/kernel/cputable.c~ppc32-remove-zero-initializations-in-cpu_specs 2004-11-10 20:24:25.712379736 -0800 +++ 25-akpm/arch/ppc/kernel/cputable.c 2004-11-10 20:24:25.720378520 -0800 @@ -94,7 +94,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_UNIFIED_CACHE, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_601 }, { /* 603 */ @@ -107,7 +106,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = COMMON_PPC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_603 }, { /* 603e */ @@ -120,7 +118,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = COMMON_PPC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_603 }, { /* 603ev */ @@ -133,7 +130,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = COMMON_PPC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_603 }, { /* 604 */ @@ -550,7 +546,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = COMMON_PPC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_603 }, { /* All G2_LE (603e core, plus some) have the same pvr */ @@ -563,7 +558,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = COMMON_PPC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_603 }, { /* default match, we assume split I/D cache & TB (non-601)... */ @@ -576,7 +570,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = COMMON_PPC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, .cpu_setup = __setup_cpu_generic }, #endif /* CLASSIC_PPC */ @@ -691,7 +684,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 16, .dcache_bsize = 16, - .num_pmcs = 0, }, #endif /* CONFIG_8xx */ #ifdef CONFIG_40x @@ -704,8 +696,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 16, .dcache_bsize = 16, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_403 */ }, { /* 403GCX */ .pvr_mask = 0xffffff00, @@ -716,8 +706,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 16, .dcache_bsize = 16, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_403 */ }, { /* 403G ?? */ .pvr_mask = 0xffff0000, @@ -728,8 +716,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 16, .dcache_bsize = 16, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_403 */ }, { /* 405GP */ .pvr_mask = 0xffff0000, @@ -741,8 +727,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* STB 03xxx */ .pvr_mask = 0xffff0000, @@ -754,8 +738,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* STB 04xxx */ .pvr_mask = 0xffff0000, @@ -767,8 +749,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* NP405L */ .pvr_mask = 0xffff0000, @@ -780,8 +760,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* NP4GS3 */ .pvr_mask = 0xffff0000, @@ -793,8 +771,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* NP405H */ .pvr_mask = 0xffff0000, @@ -806,8 +782,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* 405GPr */ .pvr_mask = 0xffff0000, @@ -819,8 +793,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* STBx25xx */ .pvr_mask = 0xffff0000, @@ -832,8 +804,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* 405LP */ .pvr_mask = 0xffff0000, @@ -844,8 +814,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, { /* Xilinx Virtex-II Pro */ .pvr_mask = 0xffff0000, @@ -857,8 +825,6 @@ struct cpu_spec cpu_specs[] = { PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_405 */ }, #endif /* CONFIG_40x */ @@ -872,8 +838,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_440 */ }, { /* 440GP Rev. C */ .pvr_mask = 0xf0000fff, @@ -884,8 +848,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_440 */ }, { /* 440GX Rev. A */ .pvr_mask = 0xf0000fff, @@ -896,8 +858,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_440 */ }, { /* 440GX Rev. B */ .pvr_mask = 0xf0000fff, @@ -908,8 +868,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_440 */ }, { /* 440GX Rev. C */ .pvr_mask = 0xf0000fff, @@ -920,8 +878,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, /*__setup_cpu_440 */ }, #endif /* CONFIG_44x */ #ifdef CONFIG_E500 @@ -938,7 +894,6 @@ struct cpu_spec cpu_specs[] = { .icache_bsize = 32, .dcache_bsize = 32, .num_pmcs = 4, - .cpu_setup = 0, /*__setup_cpu_e500 */ }, #endif #if !CLASSIC_PPC @@ -950,8 +905,6 @@ struct cpu_spec cpu_specs[] = { .cpu_user_features = PPC_FEATURE_32, .icache_bsize = 32, .dcache_bsize = 32, - .num_pmcs = 0, - .cpu_setup = 0, } #endif /* !CLASSIC_PPC */ }; _