From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933354AbcHJVYv (ORCPT ); Wed, 10 Aug 2016 17:24:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56010 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932544AbcHJSDp (ORCPT ); Wed, 10 Aug 2016 14:03:45 -0400 Date: Wed, 10 Aug 2016 11:03:07 -0700 From: tip-bot for Morten Rasmussen Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, efault@gmx.de, linux-kernel@vger.kernel.org, morten.rasmussen@arm.com Reply-To: tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, morten.rasmussen@arm.com, linux-kernel@vger.kernel.org, efault@gmx.de, torvalds@linux-foundation.org, peterz@infradead.org In-Reply-To: <1466615004-3503-2-git-send-email-morten.rasmussen@arm.com> References: <1466615004-3503-2-git-send-email-morten.rasmussen@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/core: Fix power to capacity renaming in comment Git-Commit-ID: bd425d4bfc7a1a6064dbbadfbac9c7eec0e426ec 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bd425d4bfc7a1a6064dbbadfbac9c7eec0e426ec Gitweb: http://git.kernel.org/tip/bd425d4bfc7a1a6064dbbadfbac9c7eec0e426ec Author: Morten Rasmussen AuthorDate: Wed, 22 Jun 2016 18:03:12 +0100 Committer: Ingo Molnar CommitDate: Wed, 10 Aug 2016 14:03:32 +0200 sched/core: Fix power to capacity renaming in comment It is seems that this one escaped Nico's renaming of cpu_power to cpu_capacity a while back. Signed-off-by: Morten Rasmussen Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: dietmar.eggemann@arm.com Cc: linux-kernel@vger.kernel.org Cc: mgalbraith@suse.de Cc: vincent.guittot@linaro.org Cc: yuyang.du@intel.com Link: http://lkml.kernel.org/r/1466615004-3503-2-git-send-email-morten.rasmussen@arm.com Signed-off-by: Ingo Molnar --- include/linux/sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 62c68e5..f3db596 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1022,7 +1022,7 @@ extern void wake_up_q(struct wake_q_head *head); #define SD_BALANCE_FORK 0x0008 /* Balance on fork, clone */ #define SD_BALANCE_WAKE 0x0010 /* Balance on wakeup */ #define SD_WAKE_AFFINE 0x0020 /* Wake task to waking CPU */ -#define SD_SHARE_CPUCAPACITY 0x0080 /* Domain members share cpu power */ +#define SD_SHARE_CPUCAPACITY 0x0080 /* Domain members share cpu capacity */ #define SD_SHARE_POWERDOMAIN 0x0100 /* Domain members share power domain */ #define SD_SHARE_PKG_RESOURCES 0x0200 /* Domain members share cpu pkg resources */ #define SD_SERIALIZE 0x0400 /* Only a single load balancing instance */