aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-03-08 13:54:40 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2018-03-13 23:43:04 +1100
commit5017e875e497c00dbc17558161fec3ff30b2b4a9 (patch)
treecb59435fd3ff5295d3446e7c71a80d8bcb789df0
parentpowerpc/pseries: Move smp_query_cpu_stopped() etc. out of plpar_wrappers.h (diff)
downloadlinux-dev-5017e875e497c00dbc17558161fec3ff30b2b4a9.tar.xz
linux-dev-5017e875e497c00dbc17558161fec3ff30b2b4a9.zip
powerpc/pseries: Make plpar_wrappers.h safe to include when PSERIES=n
Currently plpar_wrappers.h is not safe to include when CONFIG_PPC_PSERIES=n, or at least it can be depending on other config options and so on. Fix that by wrapping the entire content in an ifdef. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/include/asm/plpar_wrappers.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h
index 1776af9e0118..09cb26816b2d 100644
--- a/arch/powerpc/include/asm/plpar_wrappers.h
+++ b/arch/powerpc/include/asm/plpar_wrappers.h
@@ -2,6 +2,8 @@
#ifndef _ASM_POWERPC_PLPAR_WRAPPERS_H
#define _ASM_POWERPC_PLPAR_WRAPPERS_H
+#ifdef CONFIG_PPC_PSERIES
+
#include <linux/string.h>
#include <linux/irqflags.h>
@@ -332,4 +334,6 @@ static inline long plpar_get_cpu_characteristics(struct h_cpu_char_result *p)
return rc;
}
+#endif /* CONFIG_PPC_PSERIES */
+
#endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */