From patchwork Fri Apr 18 11:34:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 28629 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E8F9F20548 for ; Fri, 18 Apr 2014 11:35:37 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id fb1sf5949485pad.4 for ; Fri, 18 Apr 2014 04:35:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=dCSkyyGKP0Noau7O2apko778a0jx2k/7U3IcsSWRPuQ=; b=at3piLjj42CpPTQAMHTg9cmvJfZYi/AVcZ/4s7H65wrnMmG23+CA3dXiHWrowPWPsj rOfqjTJizKFe4BiOb5VSWnb1082jHB9vCwcpAx/bb3GJlnRSlEHKl23M5uL9Iq31Qlk6 SF30Dyuixd39KiRUqTv+mwYI1avzY2Op7UQ9zeNNrj5J7nlIwgrIeyPqzSS2Z09Jyhy/ UCm0rbRaXMOF22vLAwo/IuU6TGEHS8R88HrqauDl9YJ3wiQihnkbrlzjIxuegurkTddo Ie4dy3Re2PxkGxeq+o3V0LgaoQ5F8Yv7ETJYbLXPdBINtTqGFBPnsl3UEPw494XdJJu3 JLBg== X-Gm-Message-State: ALoCoQkchh5GtrA4Oc9NNceidjnr3bYjUx7mmwbTomOqnjsaPqLFvUHdS1kJJpPoCx6++LKFuXLV X-Received: by 10.67.4.202 with SMTP id cg10mr9705328pad.42.1397820936321; Fri, 18 Apr 2014 04:35:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.103 with SMTP id k94ls1528330qgd.30.gmail; Fri, 18 Apr 2014 04:35:36 -0700 (PDT) X-Received: by 10.58.13.104 with SMTP id g8mr13279147vec.16.1397820936180; Fri, 18 Apr 2014 04:35:36 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id fv9si4915354vcb.128.2014.04.18.04.35.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Apr 2014 04:35:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so2604034veb.40 for ; Fri, 18 Apr 2014 04:35:36 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr16592081vec.6.1397820936089; Fri, 18 Apr 2014 04:35:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp106149vcb; Fri, 18 Apr 2014 04:35:35 -0700 (PDT) X-Received: by 10.66.190.4 with SMTP id gm4mr21365971pac.116.1397820935352; Fri, 18 Apr 2014 04:35:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vv4si3216913pbc.279.2014.04.18.04.35.34; Fri, 18 Apr 2014 04:35:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbaDRLf0 (ORCPT + 26 others); Fri, 18 Apr 2014 07:35:26 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:33050 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750857AbaDRLfV (ORCPT ); Fri, 18 Apr 2014 07:35:21 -0400 Received: by mail-we0-f178.google.com with SMTP id u56so1452573wes.23 for ; Fri, 18 Apr 2014 04:35:20 -0700 (PDT) X-Received: by 10.194.87.163 with SMTP id az3mr305142wjb.63.1397820920429; Fri, 18 Apr 2014 04:35:20 -0700 (PDT) Received: from lmenx30s.lme.st.com (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id gz1sm2795832wib.14.2014.04.18.04.35.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Apr 2014 04:35:19 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, dietmar.eggemann@arm.com, preeti@linux.vnet.ibm.com, linaro-kernel@lists.linaro.org, tony.luck@intel.com, fenghua.yu@intel.com, schwidefsky@de.ibm.com, cmetcalf@tilera.com, benh@kernel.crashing.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, Vincent Guittot Subject: [PATCH] fix: sched: rework of sched_domain topology definition Date: Fri, 18 Apr 2014 13:34:06 +0200 Message-Id: <1397820846-32603-1-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20140418105601.GU11182@twins.programming.kicks-ass.net> References: <20140418105601.GU11182@twins.programming.kicks-ass.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vincent.guittot@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , fix missing change from int to pointer function for numa flags Signed-off-by: Vincent Guittot --- include/linux/sched.h | 7 +++++++ kernel/sched/core.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 18464cb..d2b981c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -887,6 +887,13 @@ static inline const int cpu_core_flags(void) } #endif +#ifdef CONFIG_NUMA +static inline const int cpu_numa_flags(void) +{ + return SD_NUMA; +} +#endif + struct sched_domain_attr { int relax_domain_level; }; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a30b0b4..24d0831 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6235,7 +6235,7 @@ static void sched_init_numa(void) for (j = 0; j < level; i++, j++) { tl[i] = (struct sched_domain_topology_level){ .mask = sd_numa_mask, - .sd_flags = SD_NUMA, + .sd_flags = cpu_numa_flags, .flags = SDTL_OVERLAP, .numa_level = j, SD_INIT_NAME(NUMA)