From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by kanga.kvack.org (Postfix) with ESMTP id 2D0B26B0036 for ; Tue, 10 Dec 2013 04:19:55 -0500 (EST) Received: by mail-pd0-f176.google.com with SMTP id w10so6954793pde.35 for ; Tue, 10 Dec 2013 01:19:54 -0800 (PST) Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com. [202.81.31.144]) by mx.google.com with ESMTPS id ez5si9886076pab.164.2013.12.10.01.19.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Dec 2013 01:19:53 -0800 (PST) Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 10 Dec 2013 19:19:48 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id B2D302CE8040 for ; Tue, 10 Dec 2013 20:19:44 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rBA91OxN9765232 for ; Tue, 10 Dec 2013 20:01:24 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rBA9JioW031890 for ; Tue, 10 Dec 2013 20:19:44 +1100 From: Wanpeng Li Subject: [PATCH v4 04/12] sched/numa: use wrapper function task_node to get node which task is on Date: Tue, 10 Dec 2013 17:19:27 +0800 Message-Id: <1386667175-19952-4-git-send-email-liwanp@linux.vnet.ibm.com> In-Reply-To: <1386667175-19952-1-git-send-email-liwanp@linux.vnet.ibm.com> References: <1386667175-19952-1-git-send-email-liwanp@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Ingo Molnar Cc: Rik van Riel , Mel Gorman , Peter Zijlstra , Naoya Horiguchi , linux-kernel@vger.kernel.org, linux-mm@kvack.org, 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.7.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org