Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de1b301a authored by Wanpeng Li's avatar Wanpeng Li Committed by Ingo Molnar
Browse files

sched/numa: Use wrapper function task_node to get node which task is on 



Use wrapper function task_node to get node which task is on.

Signed-off-by: default avatarWanpeng Li <liwanp@linux.vnet.ibm.com>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Reviewed-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/1386833006-6600-2-git-send-email-liwanp@linux.vnet.ibm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1bd53a7e

kernel/sched/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) 
		0LL, 0LL, 0LL, 0L, 0LL, 0L, 0LL, 0L);

#endif

#ifdef CONFIG_NUMA_BALANCING

	SEQ_printf(m, " %d", cpu_to_node(task_cpu(p)));

	SEQ_printf(m, " %d", task_node(p));

#endif

#ifdef CONFIG_CGROUP_SCHED

	SEQ_printf(m, " %s", task_group_path(task_group(p)));

kernel/sched/fair.c

+2 −2
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ static int task_numa_migrate(struct task_struct *p) 
	 * elsewhere, so there is no point in (re)trying.

	 */

	if (unlikely(!sd)) {

		p->numa_preferred_nid = cpu_to_node(task_cpu(p));

		p->numa_preferred_nid = task_node(p);

		return -EINVAL;

	}
@@ -1269,7 +1269,7 @@ static void numa_migrate_preferred(struct task_struct *p) 
	p->numa_migrate_retry = jiffies + HZ;



	/* Success if task is already running on preferred CPU */

	if (cpu_to_node(task_cpu(p)) == p->numa_preferred_nid)

	if (task_node(p) == p->numa_preferred_nid)

		return;



	/* Otherwise, try migrate to a CPU on the preferred node */