diff --git a/[refs] b/[refs] index 910291eca2cf..7a7b196e22a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fea82ab1a74030f79a2adfac1af3d93b8638fc3 +refs/heads/master: 04ed65190a5d1562220dd3a7fc9eac2402c7104c diff --git a/trunk/arch/ppc64/oprofile/common.c b/trunk/arch/ppc64/oprofile/common.c index b28bfda23d94..4acd1a424933 100644 --- a/trunk/arch/ppc64/oprofile/common.c +++ b/trunk/arch/ppc64/oprofile/common.c @@ -153,6 +153,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) case PV_970: case PV_970FX: + case PV_970MP: model = &op_model_power4; model->num_counters = 8; ops->cpu_type = "ppc64/970"; diff --git a/trunk/include/asm-ppc64/processor.h b/trunk/include/asm-ppc64/processor.h index 50b14c0ddb87..7bd4796f1236 100644 --- a/trunk/include/asm-ppc64/processor.h +++ b/trunk/include/asm-ppc64/processor.h @@ -268,6 +268,7 @@ #define PV_970FX 0x003C #define PV_630 0x0040 #define PV_630p 0x0041 +#define PV_970MP 0x0044 #define PV_BE 0x0070 /* Platforms supported by PPC64 */