tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix setting of oprofile cpu type
powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
powerpc adjust oprofile_cpu_type version 3

Linus Torvalds 32bc66d8 a31ea2f5

+12 -7
unified split
+2 -2
MAINTAINERS
··· 3434 3434 S: Maintained 3435 3435 3436 3436 LINUX FOR POWERPC EMBEDDED MPC5XXX 3437 - P: Sylvain Munaut 3438 - M: tnt@246tNt.com 3439 3437 P: Grant Likely 3440 3438 M: grant.likely@secretlab.ca 3441 3439 L: linuxppc-dev@ozlabs.org 3440 + T: git git://git.secretlab.ca/git/linux-2.6.git 3442 3441 S: Maintained 3443 3442 3444 3443 LINUX FOR POWERPC EMBEDDED PPC4XX ··· 3455 3456 M: grant.likely@secretlab.ca 3456 3457 W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex 3457 3458 L: linuxppc-dev@ozlabs.org 3459 + T: git git://git.secretlab.ca/git/linux-2.6.git 3458 3460 S: Maintained 3459 3461 3460 3462 LINUX FOR POWERPC EMBEDDED PPC8XX
+10 -5
arch/powerpc/kernel/cputable.c
··· 382 382 .icache_bsize = 128, 383 383 .dcache_bsize = 128, 384 384 .machine_check = machine_check_generic, 385 - .oprofile_cpu_type = "ppc64/compat-power5+", 385 + .oprofile_cpu_type = "ppc64/ibm-compat-v1", 386 + .oprofile_type = PPC_OPROFILE_POWER4, 386 387 .platform = "power5+", 387 388 }, 388 389 { /* Power6 */ ··· 417 416 .icache_bsize = 128, 418 417 .dcache_bsize = 128, 419 418 .machine_check = machine_check_generic, 420 - .oprofile_cpu_type = "ppc64/compat-power6", 419 + .oprofile_cpu_type = "ppc64/ibm-compat-v1", 420 + .oprofile_type = PPC_OPROFILE_POWER4, 421 421 .platform = "power6", 422 422 }, 423 423 { /* 2.06-compliant processor, i.e. Power7 "architected" mode */ ··· 431 429 .icache_bsize = 128, 432 430 .dcache_bsize = 128, 433 431 .machine_check = machine_check_generic, 434 - .oprofile_cpu_type = "ppc64/compat-power7", 432 + .oprofile_type = PPC_OPROFILE_POWER4, 433 + .oprofile_cpu_type = "ppc64/ibm-compat-v1", 435 434 .platform = "power7", 436 435 }, 437 436 { /* Power7 */ ··· 1836 1833 * and, in that case, keep the current value for 1837 1834 * oprofile_cpu_type. 1838 1835 */ 1839 - if (old.oprofile_cpu_type == NULL) 1840 - t->oprofile_cpu_type = s->oprofile_cpu_type; 1836 + if (old.oprofile_cpu_type == NULL) { 1837 + t->oprofile_cpu_type = old.oprofile_cpu_type; 1838 + t->oprofile_type = old.oprofile_type; 1839 + } 1841 1840 } 1842 1841 1843 1842 *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;