microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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
This commit is contained in:
Linus Torvalds 2009-05-05 08:25:37 -07:00
Родитель a31ea2f568 0203d6ec4e
Коммит 32bc66d8d0
2 изменённых файлов: 12 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
MAINTAINERS
Просмотреть файл

@ -3434,11 +3434,10 @@ L: linuxppc-dev@ozlabs.org
S: Maintained S: Maintained
LINUX FOR POWERPC EMBEDDED MPC5XXX LINUX FOR POWERPC EMBEDDED MPC5XXX
P: Sylvain Munaut
M: tnt@246tNt.com
P: Grant Likely P: Grant Likely
M: grant.likely@secretlab.ca M: grant.likely@secretlab.ca
L: linuxppc-dev@ozlabs.org L: linuxppc-dev@ozlabs.org
T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained S: Maintained
LINUX FOR POWERPC EMBEDDED PPC4XX LINUX FOR POWERPC EMBEDDED PPC4XX
@ -3456,6 +3455,7 @@ P: Grant Likely
M: grant.likely@secretlab.ca M: grant.likely@secretlab.ca
W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
L: linuxppc-dev@ozlabs.org L: linuxppc-dev@ozlabs.org
T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained S: Maintained
LINUX FOR POWERPC EMBEDDED PPC8XX LINUX FOR POWERPC EMBEDDED PPC8XX

15
arch/powerpc/kernel/cputable.c
Просмотреть файл

@ -382,7 +382,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.machine_check = machine_check_generic, .machine_check = machine_check_generic,
.oprofile_cpu_type = "ppc64/compat-power5+", .oprofile_cpu_type = "ppc64/ibm-compat-v1",
.oprofile_type = PPC_OPROFILE_POWER4,
.platform = "power5+", .platform = "power5+",
}, },
{ /* Power6 */ { /* Power6 */
@ -416,7 +417,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.machine_check = machine_check_generic, .machine_check = machine_check_generic,
.oprofile_cpu_type = "ppc64/compat-power6", .oprofile_cpu_type = "ppc64/ibm-compat-v1",
.oprofile_type = PPC_OPROFILE_POWER4,
.platform = "power6", .platform = "power6",
}, },
{ /* 2.06-compliant processor, i.e. Power7 "architected" mode */ { /* 2.06-compliant processor, i.e. Power7 "architected" mode */
@ -429,7 +431,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.machine_check = machine_check_generic, .machine_check = machine_check_generic,
.oprofile_cpu_type = "ppc64/compat-power7", .oprofile_type = PPC_OPROFILE_POWER4,
.oprofile_cpu_type = "ppc64/ibm-compat-v1",
.platform = "power7", .platform = "power7",
}, },
{ /* Power7 */ { /* Power7 */
@ -1833,8 +1836,10 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)
* and, in that case, keep the current value for * and, in that case, keep the current value for
* oprofile_cpu_type. * oprofile_cpu_type.
*/ */
if (old.oprofile_cpu_type == NULL) if (old.oprofile_cpu_type == NULL) {
t->oprofile_cpu_type = s->oprofile_cpu_type; t->oprofile_cpu_type = old.oprofile_cpu_type;
t->oprofile_type = old.oprofile_type;
}
} }
*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;