Patch "sched/numa: Hide numa_wake_affine() from UP build" has been added to the 4.12-stable tree

Patch "sched/numa: Hide numa_wake_affine() from UP build" has been added to the 4.12-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    sched/numa: Hide numa_wake_affine() from UP build

to the 4.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     sched-numa-hide-numa_wake_affine-from-up-build.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From ff801b716effd652f420204eddb36f6e4a716819 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 29 Jun 2017 08:25:52 +0200
Subject: sched/numa: Hide numa_wake_affine() from UP build

From: Thomas Gleixner <tglx@linutronix.de>

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 <sfr@canb.auug.org.au>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 kernel/sched/fair.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2651,12 +2651,14 @@ static inline void account_numa_dequeue(
 {
 }
 
+#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


Patches currently in stable-queue which might be from tglx@linutronix.de are

queue-4.12/sched-numa-hide-numa_wake_affine-from-up-build.patch
queue-4.12/sched-numa-use-down_read_trylock-for-the-mmap_sem.patch
queue-4.12/x86-uaccess-optimize-copy_user_enhanced_fast_string-for-short-strings.patch
queue-4.12/sched-core-implement-new-approach-to-scale-select_idle_cpu.patch
queue-4.12/sched-fair-remove-effective_load.patch
queue-4.12/sched-numa-implement-numa-node-level-wake_affine.patch
queue-4.12/sched-fair-simplify-wake_affine-for-the-single-socket-case.patch
queue-4.12/sched-fair-cpumask-export-for_each_cpu_wrap.patch
queue-4.12/sched-numa-override-part-of-migrate_degrades_locality-when-idle-balancing.patch