From: tip-bot for Wanpeng Li <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
liwanp@linux.vnet.ibm.com, peterz@infradead.org,
n-horiguchi@ah.jp.nec.com, riel@redhat.com,
akpm@linux-foundation.org, mgorman@suse.de, tglx@linutronix.de,
rientjes@google.com
Subject: [tip:sched/core] sched/numa: Use wrapper function task_faults_idx to calculate index in group_faults
Date: Wed, 18 Dec 2013 02:33:07 -0800 [thread overview]
Message-ID: <tip-82897b4fd3920ffd2456731d4f2ae1406558ef4c@git.kernel.org> (raw)
In-Reply-To: <1386833006-6600-3-git-send-email-liwanp@linux.vnet.ibm.com>
Commit-ID: 82897b4fd3920ffd2456731d4f2ae1406558ef4c
Gitweb: http://git.kernel.org/tip/82897b4fd3920ffd2456731d4f2ae1406558ef4c
Author: Wanpeng Li <liwanp@linux.vnet.ibm.com>
AuthorDate: Thu, 12 Dec 2013 15:23:25 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 17 Dec 2013 15:24:40 +0100
sched/numa: Use wrapper function task_faults_idx to calculate index in group_faults
Use wrapper function task_faults_idx to calculate index in group_faults.
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Rik van Riel <riel@redhat.com>
Link: http://lkml.kernel.org/r/1386833006-6600-3-git-send-email-liwanp@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/fair.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ebdb08b..37892d7 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -921,7 +921,8 @@ static inline unsigned long group_faults(struct task_struct *p, int nid)
if (!p->numa_group)
return 0;
- return p->numa_group->faults[2*nid] + p->numa_group->faults[2*nid+1];
+ return p->numa_group->faults[task_faults_idx(nid, 0)] +
+ p->numa_group->faults[task_faults_idx(nid, 1)];
}
/*
next prev parent reply other threads:[~2013-12-18 10:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 7:23 [PATCH v8 1/4] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Wanpeng Li
2013-12-12 7:23 ` [PATCH v8 2/4] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
2013-12-18 10:32 ` [tip:sched/core] sched/numa: Use " tip-bot for Wanpeng Li
2013-12-12 7:23 ` [PATCH v8 3/4] sched/numa: use wrapper function task_faults_idx to calculate index in group_faults Wanpeng Li
2013-12-18 10:33 ` tip-bot for Wanpeng Li [this message]
2013-12-12 7:23 ` [PATCH v8 4/4] sched/numa: fix period_slot recalculation Wanpeng Li
2013-12-18 10:33 ` [tip:sched/core] sched/numa: Fix " tip-bot for Wanpeng Li
2013-12-13 18:09 ` [PATCH v8 1/4] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Peter Zijlstra
[not found] ` <20131215084110.GA4316@hacker.(null)>
2013-12-15 16:56 ` Peter Zijlstra
2013-12-18 10:32 ` [tip:sched/core] sched/numa: Drop " tip-bot for Wanpeng Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-82897b4fd3920ffd2456731d4f2ae1406558ef4c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=liwanp@linux.vnet.ibm.com \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=rientjes@google.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox