| Joel Stanley | 124ce7b | 2017-07-03 14:00:01 +0930 | [diff] [blame] | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: Nicholas Piggin <npiggin@gmail.com> |
| 3 | Date: Fri, 12 May 2017 01:15:20 +1000 |
| 4 | Subject: [PATCH 2/3] powerpc/powernv: Fix CPU_HOTPLUG=n idle.c compile error |
| 5 | |
| 6 | Fixes: a7cd88da97 ("powerpc/powernv: Move CPU-Offline idle state invocation from smp.c to idle.c") |
| 7 | Cc: Gautham R. Shenoy <ego@linux.vnet.ibm.com> |
| 8 | Signed-off-by: Nicholas Piggin <npiggin@gmail.com> |
| 9 | Acked-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> |
| 10 | Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| 11 | (cherry picked from commit 67d20418088680d22037119d914982cd982b5c5a) |
| 12 | Signed-off-by: Joel Stanley <joel@jms.id.au> |
| 13 | --- |
| 14 | arch/powerpc/platforms/powernv/idle.c | 2 ++ |
| 15 | 1 file changed, 2 insertions(+) |
| 16 | |
| 17 | diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c |
| 18 | index 445f30a2c5ef..0c21747ed7e0 100644 |
| 19 | --- a/arch/powerpc/platforms/powernv/idle.c |
| 20 | +++ b/arch/powerpc/platforms/powernv/idle.c |
| 21 | @@ -261,6 +261,7 @@ static u64 pnv_deepest_stop_psscr_val; |
| 22 | static u64 pnv_deepest_stop_psscr_mask; |
| 23 | static bool deepest_stop_found; |
| 24 | |
| 25 | +#ifdef CONFIG_HOTPLUG_CPU |
| 26 | /* |
| 27 | * pnv_cpu_offline: A function that puts the CPU into the deepest |
| 28 | * available platform idle state on a CPU-Offline. |
| 29 | @@ -293,6 +294,7 @@ unsigned long pnv_cpu_offline(unsigned int cpu) |
| 30 | |
| 31 | return srr1; |
| 32 | } |
| 33 | +#endif |
| 34 | |
| 35 | /* |
| 36 | * Power ISA 3.0 idle initialization. |
| 37 | -- |
| 38 | 2.13.2 |
| 39 | |