From 8f272a5dd6826f14e47110eccd37b6782bf74901 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 14 Nov 2016 16:28:10 +1100 Subject: powerpc/pseries: Move CMO code from plapr_wrappers.h to platforms/pseries Currently there's some CMO (Cooperative Memory Overcommit) code, in plpar_wrappers.h. Some of it is #ifdef CONFIG_PSERIES and some of it isn't. The end result being if a file includes plpar_wrappers.h it won't build with CONFIG_PSERIES=n. Fix it by moving the CMO code into platforms/pseries. The two hcall wrappers can just be moved into their only caller, cmm.c, and the accessors can go in pseries.h. Note we need the accessors because cmm.c can be built as a module, so there needs to be a split between the built-in code vs the module, and that's achieved by using those accessors. Signed-off-by: Michael Ellerman --- arch/powerpc/platforms/pseries/lparcfg.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/powerpc/platforms/pseries/lparcfg.c') diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c index afa05a2cb702..e6397976060e 100644 --- a/arch/powerpc/platforms/pseries/lparcfg.c +++ b/arch/powerpc/platforms/pseries/lparcfg.c @@ -37,6 +37,7 @@ #include #include +#include "pseries.h" /* * This isn't a module but we expose that to userspace -- cgit v1.2.3