oprofile/x86: reordering some functions

Reordering some functions. Necessary for the next patch. No functional
changes.

Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>

1 files changed, 67 insertions, 67 deletions

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 94b5481bb6c6..7de0572b0a5e 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -364,56 +364,6 @@ static struct notifier_block profile_exceptions_nb = {
         .priority = 2
 };
 
-static int nmi_setup(void)
-{
-        int err = 0;
-        int cpu;
-
-        if (!allocate_msrs())
-                return -ENOMEM;
-
-        /* We need to serialize save and setup for HT because the subset
-         * of msrs are distinct for save and setup operations
-         */
-
-        /* Assume saved/restored counters are the same on all CPUs */
-        err = model->fill_in_addresses(&per_cpu(cpu_msrs, 0));
-        if (err)
-                goto fail;
-
-        for_each_possible_cpu(cpu) {
-                if (!cpu)
-                        continue;
-
-                memcpy(per_cpu(cpu_msrs, cpu).counters,
-                       per_cpu(cpu_msrs, 0).counters,
-                       sizeof(struct op_msr) * model->num_counters);
-
-                memcpy(per_cpu(cpu_msrs, cpu).controls,
-                       per_cpu(cpu_msrs, 0).controls,
-                       sizeof(struct op_msr) * model->num_controls);
-
-                mux_clone(cpu);
-        }
-
-        nmi_enabled = 0;
-        ctr_running = 0;
-        barrier();
-        err = register_die_notifier(&profile_exceptions_nb);
-        if (err)
-                goto fail;
-
-        get_online_cpus();
-        on_each_cpu(nmi_cpu_setup, NULL, 1);
-        nmi_enabled = 1;
-        put_online_cpus();
-
-        return 0;
-fail:
-        free_msrs();
-        return err;
-}
-
 static void nmi_cpu_restore_registers(struct op_msrs *msrs)
 {
         struct op_msr *counters = msrs->counters;
@@ -449,23 +399,6 @@ static void nmi_cpu_shutdown(void *dummy)
         nmi_cpu_restore_registers(msrs);
 }
 
-static void nmi_shutdown(void)
-{
-        struct op_msrs *msrs;
-
-        get_online_cpus();
-        on_each_cpu(nmi_cpu_shutdown, NULL, 1);
-        nmi_enabled = 0;
-        ctr_running = 0;
-        put_online_cpus();
-        barrier();
-        unregister_die_notifier(&profile_exceptions_nb);
-        msrs = &get_cpu_var(cpu_msrs);
-        model->shutdown(msrs);
-        free_msrs();
-        put_cpu_var(cpu_msrs);
-}
-
 static void nmi_cpu_up(void *dummy)
 {
         if (nmi_enabled)
@@ -531,6 +464,73 @@ static struct notifier_block oprofile_cpu_nb = {
         .notifier_call = oprofile_cpu_notifier
 };
 
+static int nmi_setup(void)
+{
+        int err = 0;
+        int cpu;
+
+        if (!allocate_msrs())
+                return -ENOMEM;
+
+        /* We need to serialize save and setup for HT because the subset
+         * of msrs are distinct for save and setup operations
+         */
+
+        /* Assume saved/restored counters are the same on all CPUs */
+        err = model->fill_in_addresses(&per_cpu(cpu_msrs, 0));
+        if (err)
+                goto fail;
+
+        for_each_possible_cpu(cpu) {
+                if (!cpu)
+                        continue;
+
+                memcpy(per_cpu(cpu_msrs, cpu).counters,
+                       per_cpu(cpu_msrs, 0).counters,
+                       sizeof(struct op_msr) * model->num_counters);
+
+                memcpy(per_cpu(cpu_msrs, cpu).controls,
+                       per_cpu(cpu_msrs, 0).controls,
+                       sizeof(struct op_msr) * model->num_controls);
+
+                mux_clone(cpu);
+        }
+
+        nmi_enabled = 0;
+        ctr_running = 0;
+        barrier();
+        err = register_die_notifier(&profile_exceptions_nb);
+        if (err)
+                goto fail;
+
+        get_online_cpus();
+        on_each_cpu(nmi_cpu_setup, NULL, 1);
+        nmi_enabled = 1;
+        put_online_cpus();
+
+        return 0;
+fail:
+        free_msrs();
+        return err;
+}
+
+static void nmi_shutdown(void)
+{
+        struct op_msrs *msrs;
+
+        get_online_cpus();
+        on_each_cpu(nmi_cpu_shutdown, NULL, 1);
+        nmi_enabled = 0;
+        ctr_running = 0;
+        put_online_cpus();
+        barrier();
+        unregister_die_notifier(&profile_exceptions_nb);
+        msrs = &get_cpu_var(cpu_msrs);
+        model->shutdown(msrs);
+        free_msrs();
+        put_cpu_var(cpu_msrs);
+}
+
 #ifdef CONFIG_PM
 
 static int nmi_suspend(struct sys_device *dev, pm_message_t state)