This is a note to let you know that I've just added the patch titled
powerpc/powernv: Fix CPU_HOTPLUG=n idle.c compile error
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:
powerpc-powernv-fix-cpu_hotplug-n-idle.c-compile-error.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@xxxxxxxxxxxxxxx> know about it.
>From 67d20418088680d22037119d914982cd982b5c5a Mon Sep 17 00:00:00 2001
From: Nicholas Piggin <npiggin@xxxxxxxxx>
Date: Fri, 12 May 2017 01:15:20 +1000
Subject: powerpc/powernv: Fix CPU_HOTPLUG=n idle.c compile error
From: Nicholas Piggin <npiggin@xxxxxxxxx>
commit 67d20418088680d22037119d914982cd982b5c5a upstream.
Fixes: a7cd88da97 ("powerpc/powernv: Move CPU-Offline idle state invocation from smp.c to idle.c")
Cc: Gautham R. Shenoy <ego@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Acked-by: Gautham R. Shenoy <ego@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/platforms/powernv/idle.c | 2 ++
1 file changed, 2 insertions(+)
--- a/arch/powerpc/platforms/powernv/idle.c
+++ b/arch/powerpc/platforms/powernv/idle.c
@@ -261,6 +261,7 @@ static u64 pnv_deepest_stop_psscr_val;
static u64 pnv_deepest_stop_psscr_mask;
static bool deepest_stop_found;
+#ifdef CONFIG_HOTPLUG_CPU
/*
* pnv_cpu_offline: A function that puts the CPU into the deepest
* available platform idle state on a CPU-Offline.
@@ -293,6 +294,7 @@ unsigned long pnv_cpu_offline(unsigned i
return srr1;
}
+#endif
/*
* Power ISA 3.0 idle initialization.
Patches currently in stable-queue which might be from npiggin@xxxxxxxxx are
queue-4.12/powerpc-powernv-fix-cpu_hotplug-n-idle.c-compile-error.patch