[PATCH] ARM: decompressor: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S

[Shawn Guo]

On Mon, Dec 10, 2012 at 09:49:28AM +0800, 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 at genesi-usa.com>
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> Cc: stable at vger.kernel.org

I copied stable with assuming that the patch is not going to catch
on the final 3.7 release.  If it's not the case or maintainer does not
think it's a stable material at all, we can just drop the tag.

Shawn

> ---
>  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
> -- 
> 1.7.9.5
> 
>