From patchwork Fri Jun 12 04:08:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 28616 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 77939B71AD for ; Fri, 12 Jun 2009 14:08:54 +1000 (EST) Received: by ozlabs.org (Postfix) id 6B4E8DDD0C; Fri, 12 Jun 2009 14:08:54 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (bilbo.ozlabs.org [203.10.76.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "bilbo.ozlabs.org", Issuer "CAcert Class 3 Root" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 6824DDDD0B for ; Fri, 12 Jun 2009 14:08:54 +1000 (EST) Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4642CB7534 for ; Fri, 12 Jun 2009 14:08:26 +1000 (EST) Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 57EF3B71AC for ; Fri, 12 Jun 2009 14:08:20 +1000 (EST) Received: by ozlabs.org (Postfix) id 4AEAFDDD01; Fri, 12 Jun 2009 14:08:20 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: by ozlabs.org (Postfix, from userid 1034) id 48E01DDD04; Fri, 12 Jun 2009 14:08:20 +1000 (EST) To: Message-Id: <56982642b8954ea193ae48c5d02e8dbd84d72f17.1244779685.git.michael@ellerman.id.au> From: Michael Ellerman Subject: [PATCH] powerpc: Make RTAS instantiation depend on CONFIG_PPC_RTAS Date: Fri, 12 Jun 2009 14:08:20 +1000 (EST) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Currently prom_init.c always instantiates RTAS, even if the kernel is built without RTAS support - that seems wrong. Signed-off-by: Michael Ellerman --- 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 /*