From: Scott Wood <scottwood@freescale.com>
Date: Mon, 12 May 2014 15:05:19 +0000 (-0500)
Subject: powerpc: fix build of epapr_paravirt on 64-bit book3s
X-Git-Tag: v3.16-rc1~51^2~30^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=440d74d1caf7b38f727553bc54de09c1e29e7741;p=linux.git

powerpc: fix build of epapr_paravirt on 64-bit book3s

This fixes an allyesconfig build break introduced by commit
7762b1ed7aaee223230793fcee80672e2e3aa7a8 "powerpc: move epapr paravirt
init of power_save to an initcall".

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Stuart Yoder <stuart.yoder@freescale.com>
---

diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index 8a7a62c85604..eab2f2a05e5f 100644
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -73,8 +73,10 @@ int __init epapr_paravirt_early_init(void)
 
 static int __init epapr_idle_init(void)
 {
+#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
 	if (epapr_has_idle)
 		ppc_md.power_save = epapr_ev_idle;
+#endif
 
 	return 0;
 }