Merge tag 'sched-urgent-2020-11-15' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / kernel / sched / fair.c

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 8e563cf..8917d2d 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2928,7 +2928,7 @@ static void task_tick_numa(struct rq *rq, struct task_struct *curr)
                curr->node_stamp += period;
 
                if (!time_before(jiffies, curr->mm->numa_next_scan))
-                       task_work_add(curr, work, true);
+                       task_work_add(curr, work, TWA_RESUME);
        }
 }
 
@@ -11179,7 +11179,7 @@ static unsigned int get_rr_interval_fair(struct rq *rq, struct task_struct *task
  * All the scheduling class methods:
  */
 const struct sched_class fair_sched_class
-       __attribute__((section("__fair_sched_class"))) = {
+       __section("__fair_sched_class") = {
        .enqueue_task           = enqueue_task_fair,
        .dequeue_task           = dequeue_task_fair,
        .yield_task             = yield_task_fair,