powerpc: Remove remaining parts of oprofile

-3

arch/powerpc/include/asm/cputable.h

··· 70 70 /* Used to restore cpu setup on secondary processors and at resume */ 71 71 cpu_restore_t cpu_restore; 72 72 73 - /* Used by oprofile userspace to select the right counters */ 74 - char *oprofile_cpu_type; 75 - 76 73 /* Name of processor class, for the ELF AT_PLATFORM entry */ 77 74 char *platform; 78 75

+2 -65

arch/powerpc/kernel/cputable.c

··· 149 149 .pmc_type = PPC_PMC_IBM, 150 150 .cpu_setup = __setup_cpu_ppc970, 151 151 .cpu_restore = __restore_cpu_ppc970, 152 - .oprofile_cpu_type = "ppc64/970", 153 152 .platform = "ppc970", 154 153 }, 155 154 { /* PPC970FX */ ··· 165 166 .pmc_type = PPC_PMC_IBM, 166 167 .cpu_setup = __setup_cpu_ppc970, 167 168 .cpu_restore = __restore_cpu_ppc970, 168 - .oprofile_cpu_type = "ppc64/970", 169 169 .platform = "ppc970", 170 170 }, 171 171 { /* PPC970MP DD1.0 - no DEEPNAP, use regular 970 init */ ··· 181 183 .pmc_type = PPC_PMC_IBM, 182 184 .cpu_setup = __setup_cpu_ppc970, 183 185 .cpu_restore = __restore_cpu_ppc970, 184 - .oprofile_cpu_type = "ppc64/970MP", 185 186 .platform = "ppc970", 186 187 }, 187 188 { /* PPC970MP */ ··· 197 200 .pmc_type = PPC_PMC_IBM, 198 201 .cpu_setup = __setup_cpu_ppc970MP, 199 202 .cpu_restore = __restore_cpu_ppc970, 200 - .oprofile_cpu_type = "ppc64/970MP", 201 203 .platform = "ppc970", 202 204 }, 203 205 { /* PPC970GX */ ··· 212 216 .num_pmcs = 8, 213 217 .pmc_type = PPC_PMC_IBM, 214 218 .cpu_setup = __setup_cpu_ppc970, 215 - .oprofile_cpu_type = "ppc64/970", 216 219 .platform = "ppc970", 217 220 }, 218 221 { /* Power5 GR */ ··· 225 230 .dcache_bsize = 128, 226 231 .num_pmcs = 6, 227 232 .pmc_type = PPC_PMC_IBM, 228 - .oprofile_cpu_type = "ppc64/power5", 229 233 .platform = "power5", 230 234 }, 231 235 { /* Power5++ */ ··· 237 243 .icache_bsize = 128, 238 244 .dcache_bsize = 128, 239 245 .num_pmcs = 6, 240 - .oprofile_cpu_type = "ppc64/power5++", 241 246 .platform = "power5+", 242 247 }, 243 248 { /* Power5 GS */ ··· 250 257 .dcache_bsize = 128, 251 258 .num_pmcs = 6, 252 259 .pmc_type = PPC_PMC_IBM, 253 - .oprofile_cpu_type = "ppc64/power5+", 254 260 .platform = "power5+", 255 261 }, 256 262 { /* POWER6 in P5+ mode; 2.04-compliant processor */ ··· 261 269 .mmu_features = MMU_FTRS_POWER5, 262 270 .icache_bsize = 128, 263 271 .dcache_bsize = 128, 264 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 265 272 .platform = "power5+", 266 273 }, 267 274 { /* Power6 */ ··· 275 284 .dcache_bsize = 128, 276 285 .num_pmcs = 6, 277 286 .pmc_type = PPC_PMC_IBM, 278 - .oprofile_cpu_type = "ppc64/power6", 279 287 .platform = "power6x", 280 288 }, 281 289 { /* 2.05-compliant processor, i.e. Power6 "architected" mode */ ··· 286 296 .mmu_features = MMU_FTRS_POWER6, 287 297 .icache_bsize = 128, 288 298 .dcache_bsize = 128, 289 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 290 299 .platform = "power6", 291 300 }, 292 301 { /* 2.06-compliant processor, i.e. Power7 "architected" mode */ ··· 298 309 .mmu_features = MMU_FTRS_POWER7, 299 310 .icache_bsize = 128, 300 311 .dcache_bsize = 128, 301 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 302 312 .cpu_setup = __setup_cpu_power7, 303 313 .cpu_restore = __restore_cpu_power7, 304 314 .machine_check_early = __machine_check_early_realmode_p7, ··· 313 325 .mmu_features = MMU_FTRS_POWER8, 314 326 .icache_bsize = 128, 315 327 .dcache_bsize = 128, 316 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 317 328 .cpu_setup = __setup_cpu_power8, 318 329 .cpu_restore = __restore_cpu_power8, 319 330 .machine_check_early = __machine_check_early_realmode_p8, ··· 328 341 .mmu_features = MMU_FTRS_POWER9, 329 342 .icache_bsize = 128, 330 343 .dcache_bsize = 128, 331 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 332 344 .cpu_setup = __setup_cpu_power9, 333 345 .cpu_restore = __restore_cpu_power9, 334 346 .platform = "power9", ··· 342 356 .mmu_features = MMU_FTRS_POWER10, 343 357 .icache_bsize = 128, 344 358 .dcache_bsize = 128, 345 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 346 359 .cpu_setup = __setup_cpu_power10, 347 360 .cpu_restore = __restore_cpu_power10, 348 361 .platform = "power10", ··· 358 373 .dcache_bsize = 128, 359 374 .num_pmcs = 6, 360 375 .pmc_type = PPC_PMC_IBM, 361 - .oprofile_cpu_type = "ppc64/power7", 362 376 .cpu_setup = __setup_cpu_power7, 363 377 .cpu_restore = __restore_cpu_power7, 364 378 .machine_check_early = __machine_check_early_realmode_p7, ··· 375 391 .dcache_bsize = 128, 376 392 .num_pmcs = 6, 377 393 .pmc_type = PPC_PMC_IBM, 378 - .oprofile_cpu_type = "ppc64/power7", 379 394 .cpu_setup = __setup_cpu_power7, 380 395 .cpu_restore = __restore_cpu_power7, 381 396 .machine_check_early = __machine_check_early_realmode_p7, ··· 392 409 .dcache_bsize = 128, 393 410 .num_pmcs = 6, 394 411 .pmc_type = PPC_PMC_IBM, 395 - .oprofile_cpu_type = "ppc64/power8", 396 412 .cpu_setup = __setup_cpu_power8, 397 413 .cpu_restore = __restore_cpu_power8, 398 414 .machine_check_early = __machine_check_early_realmode_p8, ··· 409 427 .dcache_bsize = 128, 410 428 .num_pmcs = 6, 411 429 .pmc_type = PPC_PMC_IBM, 412 - .oprofile_cpu_type = "ppc64/power8", 413 430 .cpu_setup = __setup_cpu_power8, 414 431 .cpu_restore = __restore_cpu_power8, 415 432 .machine_check_early = __machine_check_early_realmode_p8, ··· 426 445 .dcache_bsize = 128, 427 446 .num_pmcs = 6, 428 447 .pmc_type = PPC_PMC_IBM, 429 - .oprofile_cpu_type = "ppc64/power8", 430 448 .cpu_setup = __setup_cpu_power8, 431 449 .cpu_restore = __restore_cpu_power8, 432 450 .machine_check_early = __machine_check_early_realmode_p8, ··· 443 463 .dcache_bsize = 128, 444 464 .num_pmcs = 6, 445 465 .pmc_type = PPC_PMC_IBM, 446 - .oprofile_cpu_type = "ppc64/power9", 447 466 .cpu_setup = __setup_cpu_power9, 448 467 .cpu_restore = __restore_cpu_power9, 449 468 .machine_check_early = __machine_check_early_realmode_p9, ··· 460 481 .dcache_bsize = 128, 461 482 .num_pmcs = 6, 462 483 .pmc_type = PPC_PMC_IBM, 463 - .oprofile_cpu_type = "ppc64/power9", 464 484 .cpu_setup = __setup_cpu_power9, 465 485 .cpu_restore = __restore_cpu_power9, 466 486 .machine_check_early = __machine_check_early_realmode_p9, ··· 477 499 .dcache_bsize = 128, 478 500 .num_pmcs = 6, 479 501 .pmc_type = PPC_PMC_IBM, 480 - .oprofile_cpu_type = "ppc64/power9", 481 502 .cpu_setup = __setup_cpu_power9, 482 503 .cpu_restore = __restore_cpu_power9, 483 504 .machine_check_early = __machine_check_early_realmode_p9, ··· 494 517 .dcache_bsize = 128, 495 518 .num_pmcs = 6, 496 519 .pmc_type = PPC_PMC_IBM, 497 - .oprofile_cpu_type = "ppc64/power9", 498 520 .cpu_setup = __setup_cpu_power9, 499 521 .cpu_restore = __restore_cpu_power9, 500 522 .machine_check_early = __machine_check_early_realmode_p9, ··· 511 535 .dcache_bsize = 128, 512 536 .num_pmcs = 6, 513 537 .pmc_type = PPC_PMC_IBM, 514 - .oprofile_cpu_type = "ppc64/power10", 515 538 .cpu_setup = __setup_cpu_power10, 516 539 .cpu_restore = __restore_cpu_power10, 517 540 .machine_check_early = __machine_check_early_realmode_p10, ··· 529 554 .dcache_bsize = 128, 530 555 .num_pmcs = 4, 531 556 .pmc_type = PPC_PMC_IBM, 532 - .oprofile_cpu_type = "ppc64/cell-be", 533 557 .platform = "ppc-cell-be", 534 558 }, 535 559 { /* PA Semi PA6T */ ··· 544 570 .pmc_type = PPC_PMC_PA6T, 545 571 .cpu_setup = __setup_cpu_pa6t, 546 572 .cpu_restore = __restore_cpu_pa6t, 547 - .oprofile_cpu_type = "ppc64/pa6t", 548 573 .platform = "pa6t", 549 574 }, 550 575 { /* default match */ ··· 707 734 .cpu_setup = __setup_cpu_750, 708 735 .machine_check = machine_check_generic, 709 736 .platform = "ppc750", 710 - .oprofile_cpu_type = "ppc/750", 711 737 }, 712 738 { /* 745/755 */ 713 739 .pvr_mask = 0xfffff000, ··· 737 765 .cpu_setup = __setup_cpu_750, 738 766 .machine_check = machine_check_generic, 739 767 .platform = "ppc750", 740 - .oprofile_cpu_type = "ppc/750", 741 768 }, 742 769 { /* 750FX rev 2.0 must disable HID0[DPM] */ 743 770 .pvr_mask = 0xffffffff, ··· 752 781 .cpu_setup = __setup_cpu_750, 753 782 .machine_check = machine_check_generic, 754 783 .platform = "ppc750", 755 - .oprofile_cpu_type = "ppc/750", 756 784 }, 757 785 { /* 750FX (All revs except 2.0) */ 758 786 .pvr_mask = 0xffff0000, ··· 767 797 .cpu_setup = __setup_cpu_750fx, 768 798 .machine_check = machine_check_generic, 769 799 .platform = "ppc750", 770 - .oprofile_cpu_type = "ppc/750", 771 800 }, 772 801 { /* 750GX */ 773 802 .pvr_mask = 0xffff0000, ··· 782 813 .cpu_setup = __setup_cpu_750fx, 783 814 .machine_check = machine_check_generic, 784 815 .platform = "ppc750", 785 - .oprofile_cpu_type = "ppc/750", 786 816 }, 787 817 { /* 740/750 (L2CR bit need fixup for 740) */ 788 818 .pvr_mask = 0xffff0000, ··· 859 891 .num_pmcs = 6, 860 892 .pmc_type = PPC_PMC_G4, 861 893 .cpu_setup = __setup_cpu_745x, 862 - .oprofile_cpu_type = "ppc/7450", 863 894 .machine_check = machine_check_generic, 864 895 .platform = "ppc7450", 865 896 }, ··· 875 908 .num_pmcs = 6, 876 909 .pmc_type = PPC_PMC_G4, 877 910 .cpu_setup = __setup_cpu_745x, 878 - .oprofile_cpu_type = "ppc/7450", 879 911 .machine_check = machine_check_generic, 880 912 .platform = "ppc7450", 881 913 }, ··· 891 925 .num_pmcs = 6, 892 926 .pmc_type = PPC_PMC_G4, 893 927 .cpu_setup = __setup_cpu_745x, 894 - .oprofile_cpu_type = "ppc/7450", 895 928 .machine_check = machine_check_generic, 896 929 .platform = "ppc7450", 897 930 }, ··· 907 942 .num_pmcs = 6, 908 943 .pmc_type = PPC_PMC_G4, 909 944 .cpu_setup = __setup_cpu_745x, 910 - .oprofile_cpu_type = "ppc/7450", 911 945 .machine_check = machine_check_generic, 912 946 .platform = "ppc7450", 913 947 }, ··· 923 959 .num_pmcs = 6, 924 960 .pmc_type = PPC_PMC_G4, 925 961 .cpu_setup = __setup_cpu_745x, 926 - .oprofile_cpu_type = "ppc/7450", 927 962 .machine_check = machine_check_generic, 928 963 .platform = "ppc7450", 929 964 }, ··· 939 976 .num_pmcs = 6, 940 977 .pmc_type = PPC_PMC_G4, 941 978 .cpu_setup = __setup_cpu_745x, 942 - .oprofile_cpu_type = "ppc/7450", 943 979 .machine_check = machine_check_generic, 944 980 .platform = "ppc7450", 945 981 }, ··· 955 993 .num_pmcs = 6, 956 994 .pmc_type = PPC_PMC_G4, 957 995 .cpu_setup = __setup_cpu_745x, 958 - .oprofile_cpu_type = "ppc/7450", 959 996 .machine_check = machine_check_generic, 960 997 .platform = "ppc7450", 961 998 }, ··· 971 1010 .num_pmcs = 6, 972 1011 .pmc_type = PPC_PMC_G4, 973 1012 .cpu_setup = __setup_cpu_745x, 974 - .oprofile_cpu_type = "ppc/7450", 975 1013 .machine_check = machine_check_generic, 976 1014 .platform = "ppc7450", 977 1015 }, ··· 986 1026 .num_pmcs = 6, 987 1027 .pmc_type = PPC_PMC_G4, 988 1028 .cpu_setup = __setup_cpu_745x, 989 - .oprofile_cpu_type = "ppc/7450", 990 1029 .machine_check = machine_check_generic, 991 1030 .platform = "ppc7450", 992 1031 }, ··· 1002 1043 .num_pmcs = 6, 1003 1044 .pmc_type = PPC_PMC_G4, 1004 1045 .cpu_setup = __setup_cpu_745x, 1005 - .oprofile_cpu_type = "ppc/7450", 1006 1046 .machine_check = machine_check_generic, 1007 1047 .platform = "ppc7450", 1008 1048 }, ··· 1018 1060 .num_pmcs = 6, 1019 1061 .pmc_type = PPC_PMC_G4, 1020 1062 .cpu_setup = __setup_cpu_745x, 1021 - .oprofile_cpu_type = "ppc/7450", 1022 1063 .machine_check = machine_check_generic, 1023 1064 .platform = "ppc7450", 1024 1065 }, ··· 1129 1172 .cpu_setup = __setup_cpu_603, 1130 1173 .machine_check = machine_check_83xx, 1131 1174 .num_pmcs = 4, 1132 - .oprofile_cpu_type = "ppc/e300", 1133 1175 .platform = "ppc603", 1134 1176 }, 1135 1177 { /* e300c4 (e300c1, plus one IU) */ ··· 1144 1188 .cpu_setup = __setup_cpu_603, 1145 1189 .machine_check = machine_check_83xx, 1146 1190 .num_pmcs = 4, 1147 - .oprofile_cpu_type = "ppc/e300", 1148 1191 .platform = "ppc603", 1149 1192 }, 1150 1193 #endif ··· 1839 1884 .icache_bsize = 32, 1840 1885 .dcache_bsize = 32, 1841 1886 .num_pmcs = 4, 1842 - .oprofile_cpu_type = "ppc/e500", 1843 1887 .cpu_setup = __setup_cpu_e500v1, 1844 1888 .machine_check = machine_check_e500, 1845 1889 .platform = "ppc8540", ··· 1857 1903 .icache_bsize = 32, 1858 1904 .dcache_bsize = 32, 1859 1905 .num_pmcs = 4, 1860 - .oprofile_cpu_type = "ppc/e500", 1861 1906 .cpu_setup = __setup_cpu_e500v2, 1862 1907 .machine_check = machine_check_e500, 1863 1908 .platform = "ppc8548", ··· 1875 1922 .icache_bsize = 64, 1876 1923 .dcache_bsize = 64, 1877 1924 .num_pmcs = 4, 1878 - .oprofile_cpu_type = "ppc/e500mc", 1879 1925 .cpu_setup = __setup_cpu_e500mc, 1880 1926 .machine_check = machine_check_e500mc, 1881 1927 .platform = "ppce500mc", ··· 1895 1943 .icache_bsize = 64, 1896 1944 .dcache_bsize = 64, 1897 1945 .num_pmcs = 4, 1898 - .oprofile_cpu_type = "ppc/e500mc", 1899 1946 .cpu_setup = __setup_cpu_e5500, 1900 1947 #ifndef CONFIG_PPC32 1901 1948 .cpu_restore = __restore_cpu_e5500, ··· 1916 1965 .icache_bsize = 64, 1917 1966 .dcache_bsize = 64, 1918 1967 .num_pmcs = 6, 1919 - .oprofile_cpu_type = "ppc/e6500", 1920 1968 .cpu_setup = __setup_cpu_e6500, 1921 1969 #ifndef CONFIG_PPC32 1922 1970 .cpu_restore = __restore_cpu_e6500, ··· 1983 2033 t->pmc_type = old.pmc_type; 1984 2034 1985 2035 /* 1986 - * If we have passed through this logic once before and 1987 - * have pulled the default case because the real PVR was 1988 - * not found inside cpu_specs[], then we are possibly 1989 - * running in compatibility mode. In that case, let the 1990 - * oprofiler know which set of compatibility counters to 1991 - * pull from by making sure the oprofile_cpu_type string 1992 - * is set to that of compatibility mode. If the 1993 - * oprofile_cpu_type already has a value, then we are 1994 - * possibly overriding a real PVR with a logical one, 1995 - * and, in that case, keep the current value for 1996 - * oprofile_cpu_type. Furthermore, let's ensure that the 2036 + * Let's ensure that the 1997 2037 * fix for the PMAO bug is enabled on compatibility mode. 1998 2038 */ 1999 - if (old.oprofile_cpu_type != NULL) { 2000 - t->oprofile_cpu_type = old.oprofile_cpu_type; 2001 - t->cpu_features |= old.cpu_features & CPU_FTR_PMAO_BUG; 2002 - } 2039 + t->cpu_features |= old.cpu_features & CPU_FTR_PMAO_BUG; 2003 2040 } 2004 2041 2005 2042 *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;

-4

arch/powerpc/kernel/dt_cpu_ftrs.c

··· 102 102 .dcache_bsize = 32, /* cache info init. */ 103 103 .num_pmcs = 0, 104 104 .pmc_type = PPC_PMC_DEFAULT, 105 - .oprofile_cpu_type = NULL, 106 105 .cpu_setup = NULL, 107 106 .cpu_restore = __restore_cpu_cpufeatures, 108 107 .machine_check_early = NULL, ··· 386 387 387 388 cur_cpu_spec->num_pmcs = 6; 388 389 cur_cpu_spec->pmc_type = PPC_PMC_IBM; 389 - cur_cpu_spec->oprofile_cpu_type = "ppc64/power8"; 390 390 391 391 return 1; 392 392 } ··· 421 423 422 424 cur_cpu_spec->num_pmcs = 6; 423 425 cur_cpu_spec->pmc_type = PPC_PMC_IBM; 424 - cur_cpu_spec->oprofile_cpu_type = "ppc64/power9"; 425 426 426 427 return 1; 427 428 } ··· 446 449 447 450 cur_cpu_spec->num_pmcs = 6; 448 451 cur_cpu_spec->pmc_type = PPC_PMC_IBM; 449 - cur_cpu_spec->oprofile_cpu_type = "ppc64/power10"; 450 452 451 453 return 1; 452 454 }

+1 -1

arch/powerpc/platforms/cell/spufs/spufs.h

··· 76 76 struct address_space *mss; /* 'mss' area mappings. */ 77 77 struct address_space *psmap; /* 'psmap' area mappings. */ 78 78 struct mutex mapping_lock; 79 - u64 object_id; /* user space pointer for oprofile */ 79 + u64 object_id; /* user space pointer for GNU Debugger */ 80 80 81 81 enum { SPU_STATE_RUNNABLE, SPU_STATE_SAVED } state; 82 82 struct mutex state_mutex;

+1 -1

arch/powerpc/platforms/ps3/Kconfig

··· 165 165 166 166 If you intend to use the advanced performance monitoring and 167 167 profiling support of the Cell processor with programs like 168 - oprofile and perfmon2, then say Y or M, otherwise say N. 168 + perfmon2, then say Y or M, otherwise say N. 169 169 170 170 config PS3GELIC_UDBG 171 171 bool "PS3 udbg output via UDP broadcasts on Ethernet"