From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: decompressor: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S
Date: Mon, 10 Dec 2012 07:53:27 -0600 [thread overview]
Message-ID: <50C5E957.6050601@gmail.com> (raw)
In-Reply-To: <1355104168-30581-1-git-send-email-shawn.guo@linaro.org>
On 12/09/2012 07:49 PM, Shawn Guo wrote:
> Commit 91a9fec (ARM: move debug macros to common location) moves
> arch/arm/kernel/debug.S and arch/arm/kernel/head.S to
> CONFIG_DEBUG_LL_INCLUDE, but leaves arch/arm/boot/compressed/head.S
> still with mach/debug-macro.S. This causes the following build error
> on platforms that moved to new DEBUG_LL inclusion mechanism, when
> arch/arm/boot/compressed/head.S is compiled with DEBUG turned on.
>
> AS arch/arm/boot/compressed/head.o
> arch/arm/boot/compressed/head.S:49:30: fatal error: mach/debug-macro.S: No such file or directory
> compilation terminated.
>
> Fix the problem by replacing mach/debug-macro.S inclusion with
> CONFIG_DEBUG_LL_INCLUDE one.
>
> Reported-by: Steev Klimaszewski <steev@genesi-usa.com>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Cc: stable at vger.kernel.org
Acked-by: Rob Herring <rob.herring@calxeda.com>
Rob
> ---
> arch/arm/boot/compressed/head.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
> index 49ca86e..fe4d9c3 100644
> --- a/arch/arm/boot/compressed/head.S
> +++ b/arch/arm/boot/compressed/head.S
> @@ -44,7 +44,7 @@
>
> #else
>
> -#include <mach/debug-macro.S>
> +#include CONFIG_DEBUG_LL_INCLUDE
>
> .macro writeb, ch, rb
> senduart \ch, \rb
>
prev parent reply other threads:[~2012-12-10 13:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 1:49 [PATCH] ARM: decompressor: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S Shawn Guo
2012-12-10 1:59 ` Shawn Guo
2012-12-10 14:02 ` Russell King - ARM Linux
2012-12-10 14:46 ` Jonathan Nieder
2012-12-10 13:53 ` Rob Herring [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50C5E957.6050601@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).