[PATCH] powerpc: Make RTAS instantiation depend on CONFIG_PPC_RTAS

Michael Ellerman michael at ellerman.id.au
Fri Jun 12 14:08:20 EST 2009


Currently prom_init.c always instantiates RTAS, even if the kernel
is built without RTAS support - that seems wrong.

Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
---
 arch/powerpc/kernel/prom_init.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 2f0e64b..6c2dc59 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1052,6 +1052,7 @@ static void __init prom_init_mem(void)
 }
 
 
+#ifdef CONFIG_PPC_RTAS
 /*
  * Allocate room for and instantiate RTAS
  */
@@ -1109,6 +1110,9 @@ static void __init prom_instantiate_rtas(void)
 
 	prom_debug("prom_instantiate_rtas: end...\n");
 }
+#else
+static inline void prom_instantiate_rtas(void) { }
+#endif /* CONFIG_PPC_RTAS */
 
 #ifdef CONFIG_PPC64
 /*
-- 
1.6.2.1



More information about the Linuxppc-dev mailing list