From 1cba11784b1487980d49906ecb29903deecf8655 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 3 Jan 2014 14:09:59 +1100 Subject: [PATCH] sched-add-tracepoints-related-to-numa-task-migration-fix remove semicolon-after-if, repair coding-style Cc: Alex Thorlton Cc: Mel Gorman Cc: Rik van Riel Signed-off-by: Andrew Morton --- kernel/sched/fair.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 184ce5333a57..f21c2e87f85f 100644 --- 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; -- 2.39.5