Merge branch 'linus'

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index 0493e8b8ec49..1accce50c2c7 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -122,7 +122,7 @@ static void nmi_save_registers(void * dummy)
 static void free_msrs(void)
 {
         int i;
-        for (i = 0; i < NR_CPUS; ++i) {
+        for_each_cpu(i) {
                 kfree(cpu_msrs[i].counters);
                 cpu_msrs[i].counters = NULL;
                 kfree(cpu_msrs[i].controls);
@@ -138,10 +138,7 @@ static int allocate_msrs(void)
         size_t counters_size = sizeof(struct op_msr) * model->num_counters;
 
         int i;
-        for (i = 0; i < NR_CPUS; ++i) {
-                if (!cpu_online(i))
-                        continue;
-
+        for_each_online_cpu(i) {
                 cpu_msrs[i].counters = kmalloc(counters_size, GFP_KERNEL);
                 if (!cpu_msrs[i].counters) {
                         success = 0;