Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758538Ab2JSMCd (ORCPT ); Fri, 19 Oct 2012 08:02:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56337 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910Ab2JSMCc (ORCPT ); Fri, 19 Oct 2012 08:02:32 -0400 Date: Fri, 19 Oct 2012 05:02:02 -0700 From: tip-bot for Rik van Riel Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, torvalds@linux-foundation.org, a.p.zijlstra@chello.nl, riel@redhat.com, akpm@linux-foundation.org, tglx@linutronix.de Reply-To: riel@redhat.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, a.p.zijlstra@chello.nl, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <20121018171928.24d06af4@cuia.bos.redhat.com> References: <20121018171928.24d06af4@cuia.bos.redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:numa/core] numa: Add credits for NUMA placement Git-Commit-ID: c1a305006e4dd428001852923c11806d754db9f1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Fri, 19 Oct 2012 05:02:09 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2701 Lines: 76 Commit-ID: c1a305006e4dd428001852923c11806d754db9f1 Gitweb: http://git.kernel.org/tip/c1a305006e4dd428001852923c11806d754db9f1 Author: Rik van Riel AuthorDate: Thu, 18 Oct 2012 17:19:28 -0400 Committer: Ingo Molnar CommitDate: Fri, 19 Oct 2012 13:45:48 +0200 numa: Add credits for NUMA placement The NUMA placement code has been rewritten several times, but the basic ideas took a lot of work to develop. The people who put in the work deserve credit for it. Thanks Andrea & Peter :) [ The Documentation/scheduler/numa-problem.txt file should probably be rewritten once we figure out the final details of what the NUMA code needs to do, and why. ] Signed-off-by: Rik van Riel Acked-by: Peter Zijlstra Cc: aarcange@redhat.com Cc: Linus Torvalds Cc: Andrew Morton Link: http://lkml.kernel.org/r/20121018171928.24d06af4@cuia.bos.redhat.com Signed-off-by: Ingo Molnar ---- This is against tip.git numa/core --- CREDITS | 1 + kernel/sched/fair.c | 3 +++ mm/memory.c | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/CREDITS b/CREDITS index d8fe12a..b4cdc8f 100644 --- a/CREDITS +++ b/CREDITS @@ -125,6 +125,7 @@ D: Author of pscan that helps to fix lp/parport bugs D: Author of lil (Linux Interrupt Latency benchmark) D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message) D: VM hacker +D: NUMA task placement D: Various other kernel hacks S: Imola 40026 S: Italy diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 1e24aa1..e93032d 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -18,6 +18,9 @@ * * Adaptive scheduling granularity, math enhancements by Peter Zijlstra * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra + * + * NUMA placement, statistics and algorithm by Andrea Arcangeli, + * CFS balancing changes by Peter Zijlstra. Copyright (C) 2012 Red Hat, Inc. */ #include diff --git a/mm/memory.c b/mm/memory.c index fc48fe8..9e56a44 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -36,6 +36,8 @@ * (Gerhard.Wichert@pdb.siemens.de) * * Aug/Sep 2004 Changed to four level page tables (Andi Kleen) + * + * 2012 - NUMA placement page faults (Andrea Arcangeli, Peter Zijlstra) */ #include -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/