[PATCH v3 04/12] sched/numa: use wrapper function task_node to get node which task is on

2013-12-07 Thread Wanpeng Li
Changelog:
 v2 -> v3:
  * tranlate cpu_to_node(task_cpu(p)) to task_node(p) in sched/debug.c

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

Acked-by: Mel Gorman 
Reviewed-by: Naoya Horiguchi 
Reviewed-by: Rik van Riel 
Signed-off-by: Wanpeng Li 
---
 kernel/sched/debug.c |2 +-
 kernel/sched/fair.c  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 5c34d18..374fe04 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -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)));
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 56bcc0c..e0b1063 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1216,7 +1216,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;
}
 
@@ -1283,7 +1283,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 */
-- 
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH v3 04/12] sched/numa: use wrapper function task_node to get node which task is on

2013-12-07 Thread Wanpeng Li
Changelog:
 v2 - v3:
  * tranlate cpu_to_node(task_cpu(p)) to task_node(p) in sched/debug.c

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

Acked-by: Mel Gorman mgor...@suse.de
Reviewed-by: Naoya Horiguchi n-horigu...@ah.jp.nec.com
Reviewed-by: Rik van Riel r...@redhat.com
Signed-off-by: Wanpeng Li liw...@linux.vnet.ibm.com
---
 kernel/sched/debug.c |2 +-
 kernel/sched/fair.c  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 5c34d18..374fe04 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -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)));
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 56bcc0c..e0b1063 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1216,7 +1216,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;
}
 
@@ -1283,7 +1283,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 */
-- 
1.7.5.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/