summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Yoder <stuart.yoder@freescale.com>2014-04-30 18:34:23 -0500
committerScott Wood <scottwood@freescale.com>2014-05-22 18:08:21 -0500
commit83e267d797e0e69d0ac5741f5dc88a2df3ebb3a0 (patch)
tree5cff53ddfee04e8dc75903aeaf40442a4a8877f3
parent2b09c6038941b8ba6ee9b3851c7be50a9f3acedf (diff)
powerpc: move epapr paravirt init of power_save to an initcall
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 <stuart.yoder@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--arch/powerpc/kernel/epapr_paravirt.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index 7898be90f2dc..8a7a62c85604 100644
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -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);