sched-add-tracepoints-related-to-numa-task-migration-fix

remove semicolon-after-if, repair coding-style

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 184ce5333a57e1f5a20c787eb4b65f307a49aa68..f21c2e87f85f4642da67f77acf9b2e8c1f0a84f5 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1258,12 +1258,14 @@ static int task_numa_migrate(struct task_struct *p)
        p->numa_scan_period = task_scan_min(p);
 
        if (env.best_task == NULL) {
-               if ((ret = migrate_task_to(p, env.best_cpu)) != 0)
+               ret = migrate_task_to(p, env.best_cpu);
+               if (ret != 0)
                        trace_sched_stick_numa(p, env.src_cpu, env.best_cpu);
                return ret;
        }
 
-       if ((ret = migrate_swap(p, env.best_task)) != 0);
+       ret = migrate_swap(p, env.best_task);
+       if (ret != 0)
                trace_sched_stick_numa(p, env.src_cpu, task_cpu(env.best_task));
        put_task_struct(env.best_task);
        return ret;