From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from outbound-smtp09.blacknight.com ([46.22.139.14]:60942 "EHLO outbound-smtp09.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754042AbdGJMh4 (ORCPT ); Mon, 10 Jul 2017 08:37:56 -0400 Received: from mail.blacknight.com (pemlinmail05.blacknight.ie [81.17.254.26]) by outbound-smtp09.blacknight.com (Postfix) with ESMTPS id 0E2B71C21E2 for ; Mon, 10 Jul 2017 13:37:54 +0100 (IST) From: Mel Gorman To: Linux-Stable Cc: Mel Gorman Subject: [PATCH 9/9] sched/numa: Hide numa_wake_affine() from UP build Date: Mon, 10 Jul 2017 13:37:52 +0100 Message-Id: <20170710123752.7563-10-mgorman@techsingularity.net> In-Reply-To: <20170710123752.7563-1-mgorman@techsingularity.net> References: <20170710123752.7563-1-mgorman@techsingularity.net> Sender: stable-owner@vger.kernel.org List-ID: From: Thomas Gleixner commit ff801b716effd652f420204eddb36f6e4a716819 upstream. Stephen reported the following build warning in UP: kernel/sched/fair.c:2657:9: warning: 'struct sched_domain' declared inside parameter list ^ /home/sfr/next/next/kernel/sched/fair.c:2657:9: warning: its scope is only this definition or declaration, which is probably not what you want Hide the numa_wake_affine() inline stub on UP builds to get rid of it. Fixes: 3fed382b46ba ("sched/numa: Implement NUMA node level wake_affine()") Reported-by: Stephen Rothwell Signed-off-by: Thomas Gleixner Cc: Rik van Riel Cc: Peter Zijlstra Signed-off-by: Mel Gorman --- kernel/sched/fair.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 191f543847b8..611afc736427 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2651,12 +2651,14 @@ static inline void account_numa_dequeue(struct rq *rq, struct task_struct *p) { } +#ifdef CONFIG_SMP static inline bool numa_wake_affine(struct sched_domain *sd, struct task_struct *p, int this_cpu, int prev_cpu, int sync) { return true; } +#endif /* !SMP */ #endif /* CONFIG_NUMA_BALANCING */ static void -- 2.13.1