From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:10645 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932477Ab0J0V4p (ORCPT ); Wed, 27 Oct 2010 17:56:45 -0400 Message-ID: <4CC8A01C.3000004@codeaurora.org> Date: Wed, 27 Oct 2010 14:56:44 -0700 From: Bryan Huntsman MIME-Version: 1.0 Subject: Re: [PATCH 1/2] msm: fix compile failure when no debug uart is selected References: <1288211766-7786-1-git-send-email-dwalker@codeaurora.org> In-Reply-To: <1288211766-7786-1-git-send-email-dwalker@codeaurora.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: Daniel Walker Cc: linux-arm-msm@vger.kernel.org, davidb@codeaurora.org, rvaswani@codeaurora.org, gbean@codeaurora.org On 10/27/2010 01:36 PM, Daniel Walker wrote: > If the board has a debug uart the user is given a choice of which > uart to use. The user can also select NONE, which means not to use one. > In most of our header files when NONE is selected nothing is defined > for MSM_DEBUG_UART_PHYS or MSM_DEBUG_UART_BASE. This causes a compile > failure in debug-macro.S which expect something to be defined there. > > Example of the failure, > > arch/arm/kernel/built-in.o: In function `hexbuf': > linux-2.6/arch/arm/kernel/debug.S:186: undefined reference to `MSM_DEBUG_UART_PHYS' > linux-2.6/arch/arm/kernel/debug.S:186: undefined reference to `MSM_DEBUG_UART_BASE' > > This fixes the compile failure by adding an ifdef to debug-macro.S > that removes all the debug uart code in the case of NONE. > > Signed-off-by: Daniel Walker > --- > arch/arm/mach-msm/include/mach/debug-macro.S | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S > index 238c4f1..2cdddb9 100644 > --- a/arch/arm/mach-msm/include/mach/debug-macro.S > +++ b/arch/arm/mach-msm/include/mach/debug-macro.S > @@ -19,7 +19,7 @@ > #include > #include > > -#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS > +#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE) > .macro addruart, rx, tmp > @ see if the MMU is enabled and select appropriate base address > mrc p15, 0, \rx, c1, c0 Acked-by: Bryan Huntsman -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.