powerpc: move epapr paravirt init of power_save to an initcall

PATCH New Stuart Yoder 1 participant 1 message Apr 30, 2014 PowerPC

lore

Share & tools

lore

Stuart Yoder

author

2014-04-30 23:34 UTC #0 lore raw

PATCH v4 1/1 powerpc: move epapr paravirt init of power_save to an initcall

From: Stuart Yoder <[email protected]>

some restructuring of epapr paravirt init resulted in ppc_md.power_save being set, and then overwritten to NULL during machine_init. This patch splits the initialization of ppc_md.power_save out into a postcore init call.

Signed-off-by Stuart Yoder <[email protected]>

---
-v3
-changed approach slightly, set flag in the dt scanning
code and just look at that flag in the initcall
-v4
-made idle flag static

 arch/powerpc/kernel/epapr_paravirt.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

arch/powerpc/kernel/epapr_paravirt.c +11 -1

index 7898be9..8a7a62c 100644
@@ -30,6 +30,7 @@ extern u32 epapr_ev_idle_start[];
 #endif
 
 bool epapr_paravirt_enabled;
+static bool epapr_has_idle;
 
 static int __init early_init_dt_scan_epapr(unsigned long node,
 					   const char *uname,

@@ -55,7 +56,7 @@ static int __init early_init_dt_scan_epapr(unsigned long node,
 
 #if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
 	if (of_get_flat_dt_prop(node, "has-idle", NULL))
-		ppc_md.power_save = epapr_ev_idle;
+		epapr_has_idle = true;
 #endif
 
 	epapr_paravirt_enabled = true;

@@ -70,3 +71,12 @@ int __init epapr_paravirt_early_init(void)
 	return 0;
 }
 
+static int __init epapr_idle_init(void)
+{
+	if (epapr_has_idle)
+		ppc_md.power_save = epapr_ev_idle;
+
+	return 0;
+}
+
+postcore_initcall(epapr_idle_init);

Signature · 1 line

1.7.9.7