1 files changed, 9 insertions, 3 deletions

diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index a7c0783b269a..11b7a51566a8 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -154,7 +154,7 @@ static int allocate_msrs(void)
         size_t counters_size = sizeof(struct op_msr) * model->num_counters;
 
         int i;
-        for_each_online_cpu(i) {
+        for_each_possible_cpu(i) {
                 cpu_msrs[i].counters = kmalloc(counters_size, GFP_KERNEL);
                 if (!cpu_msrs[i].counters) {
                         success = 0;
@@ -211,8 +211,14 @@ static int nmi_setup(void)
         /* Assume saved/restored counters are the same on all CPUs */
         model->fill_in_addresses(&cpu_msrs[0]);
         for_each_possible_cpu (cpu) {
-                if (cpu != 0)
-                        cpu_msrs[cpu] = cpu_msrs[0];
+                if (cpu != 0) {
+                        memcpy(cpu_msrs[cpu].counters, cpu_msrs[0].counters,
+                                sizeof(struct op_msr) * model->num_counters);
+
+                        memcpy(cpu_msrs[cpu].controls, cpu_msrs[0].controls,
+                                sizeof(struct op_msr) * model->num_controls);
+                }
+
         }
         on_each_cpu(nmi_save_registers, NULL, 0, 1);
         on_each_cpu(nmi_cpu_setup, NULL, 0, 1);