diff --git a/[refs] b/[refs] index 95679480c8f6..4234ee3a9751 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97e133b4543c5c677e768a8538d6d704c4218ff2 +refs/heads/master: df4927bf6ccf6278a97a44bd107080c71b269cb5 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index e0c0b4bc3f08..8e1352c75557 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1617,8 +1617,6 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) } } -#define swap(a, b) do { typeof(a) tmp = (a); (a) = (b); (b) = tmp; } while (0) - /* * Share the fairness runtime between parent and child, thus the * total amount of pressure for CPU stays equal - new tasks