Skip to contentSkip to conversation

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

PATCH New Shawn Guo 4 participants 5 messages Dec 10, 2012 Arm (32-bit)

lore
Share & tools
lore

Shawn Guo

author
#0 lore raw

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

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 <[email protected]>
Signed-off-by Shawn Guo <[email protected]>
Cc stable at vger.kernel.org
---
 arch/arm/boot/compressed/head.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/compressed/head.S +1 -1
index 49ca86e..fe4d9c3 100644
@@ -44,7 +44,7 @@
 
 #else
 
-#include <mach/debug-macro.S>
+#include CONFIG_DEBUG_LL_INCLUDE
 
 		.macro	writeb,	ch, rb
 		senduart \ch, \rb
Signature · 1 line
1.7.9.5
author
#1 lore raw

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

Quoted 11 lines · Shawn Guo

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.

Quoted 6 lines

Fix the problem by replacing mach/debug-macro.S inclusion with CONFIG_DEBUG_LL_INCLUDE one.

Reported-by Steev Klimaszewski <[email protected]>
Signed-off-by Shawn Guo <[email protected]>
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

Quoted 21 lines
---
 arch/arm/boot/compressed/head.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/compressed/head.S +1 -1
index 49ca86e..fe4d9c3 100644
@@ -44,7 +44,7 @@
 
 #else
 
-#include <mach/debug-macro.S>
+#include CONFIG_DEBUG_LL_INCLUDE
 
 		.macro	writeb,	ch, rb
 		senduart \ch, \rb
Signature · 1 line
1.7.9.5
#2 lore raw

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

Quoted 15 lines · Shawn Guo
Quoted 14 lines · Shawn Guo

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.

Quoted 7 lines
Quoted 3 lines
Reported-by Steev Klimaszewski <[email protected]>
Signed-off-by Shawn Guo <[email protected]>
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.

That worries me a bit because I can see this ending up getting applied to multiple stable kernel trees, even those without CONFIG_DEBUG_LL_INCLUDE. So, let's have it in the patch system without the stable tag.

Thanks.

#3 lore raw

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

Quoted 3 lines · Russell King - ARM Linux

That worries me a bit because I can see this ending up getting applied to multiple stable kernel trees, even those without CONFIG_DEBUG_LL_INCLUDE. So, let's have it in the patch system without the stable tag.

If it should only be included in 3.7-stable, a line like "Cc: stable at vger.kernel.org # 3.7+" would work fine.

Hope that helps,
Jonathan

#4 lore raw

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

In reply to Shawn Guo
Quoted 11 lines · Shawn Guo

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.

Quoted 6 lines

Fix the problem by replacing mach/debug-macro.S inclusion with CONFIG_DEBUG_LL_INCLUDE one.

Reported-by Steev Klimaszewski <[email protected]>
Signed-off-by Shawn Guo <[email protected]>
Cc stable at vger.kernel.org
Acked-by Rob Herring <[email protected]>

Rob

Quoted 18 lines
---
 arch/arm/boot/compressed/head.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/compressed/head.S +1 -1
index 49ca86e..fe4d9c3 100644
@@ -44,7 +44,7 @@
 
 #else
 
-#include <mach/debug-macro.S>
+#include CONFIG_DEBUG_LL_INCLUDE
 
 		.macro	writeb,	ch, rb
 		senduart \ch, \rb