Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent

2 files changed, 6 insertions, 3 deletions

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 022cd41ea9b4..202864ad49a7 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type)
                 *cpu_type = "i386/pii";
                 break;
         case 6 ... 8:
+        case 10 ... 11:
                 *cpu_type = "i386/piii";
                 break;
         case 9:
+        case 13:
                 *cpu_type = "i386/p6_mobile";
                 break;
-        case 10 ... 13:
-                *cpu_type = "i386/p6";
-                break;
         case 14:
                 *cpu_type = "i386/core";
                 break;
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index 716d26f0e5d4..e9f80c744cf3 100644
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs)
         unsigned int low, high;
         int i;
 
+        if (!reset_value)
+                return;
         for (i = 0; i < num_counters; ++i) {
                 if (reset_value[i]) {
                         CTRL_READ(low, high, msrs, i);
@@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs)
         unsigned int low, high;
         int i;
 
+        if (!reset_value)
+                return;
         for (i = 0; i < num_counters; ++i) {
                 if (!reset_value[i])
                         continue;