[PATCH] Fix "W" macro in arch/arm/include/asm/unified.h

[PATCH] Fix "W" macro in arch/arm/include/asm/unified.h

[Catalin Marinas]

From: Alexey Dobriyan <adobriyan@gmail.com>

Please, fold into 0becb088501886f37ade38762c8eaaf4263572cc
aka "Thumb-2: Add macros for the unified assembler syntax"

otherwise:

	crypto/cast6.c:372:39: error: macro "W" passed 2 arguments, but takes just 1

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm/include/asm/unified.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index 073e85b..bc63116 100644
--- a/arch/arm/include/asm/unified.h
+++ b/arch/arm/include/asm/unified.h
@@ -35,7 +35,9 @@
 
 #define ARM(x...)
 #define THUMB(x...)	x
+#ifdef __ASSEMBLY__
 #define W(instr)	instr.w
+#endif
 #define BSYM(sym)	sym + 1
 
 #else	/* !CONFIG_THUMB2_KERNEL */
@@ -45,7 +47,9 @@
 
 #define ARM(x...)	x
 #define THUMB(x...)
+#ifdef __ASSEMBLY__
 #define W(instr)	instr
+#endif
 #define BSYM(sym)	sym
 
 #endif	/* CONFIG_THUMB2_KERNEL */

Re: [PATCH] Fix "W" macro in arch/arm/include/asm/unified.h

[Russell King - ARM Linux]

On Thu, Sep 17, 2009 at 10:12:37AM +0100, Catalin Marinas wrote:
> From: Alexey Dobriyan <adobriyan@gmail.com>
> 
> Please, fold into 0becb088501886f37ade38762c8eaaf4263572cc
> aka "Thumb-2: Add macros for the unified assembler syntax"

Folding it into that commit is not possible; as such a better patch
description is desirable.

[PATCH v2] arm: export "W" macro just for assembly code

[Sebastian Andrzej Siewior]

From: Alexey Dobriyan <adobriyan@gmail.com>

The W macro which got introduced in 0becb08 aka "Thumb-2: Add macros for
the unified assembler syntax" clashes with the W function in
crypto/cast6.c since commit 8b59278 aka "Thumb-2: Implement the unified
arch/arm/lib functions" due to the following include path:
|arch/arm/include/asm/unified.h <---
|arch/arm/include/asm/uaccess.h:20
|include/linux/uaccess.h:5
|include/linux/crypto.h:26
|crypto/cast6.c:23

This patch allows the usage of the new W macro only in assembly files
since it is the place where it is used.

[sebastian@breakpoint]: patch description
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
---
Russel, I've added a new patch description for this patch since my
rename edition was a little larger.

 arch/arm/include/asm/unified.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index 073e85b..bc63116 100644
--- a/arch/arm/include/asm/unified.h
+++ b/arch/arm/include/asm/unified.h
@@ -35,7 +35,9 @@
 
 #define ARM(x...)
 #define THUMB(x...)	x
+#ifdef __ASSEMBLY__
 #define W(instr)	instr.w
+#endif
 #define BSYM(sym)	sym + 1
 
 #else	/* !CONFIG_THUMB2_KERNEL */
@@ -45,7 +47,9 @@
 
 #define ARM(x...)	x
 #define THUMB(x...)
+#ifdef __ASSEMBLY__
 #define W(instr)	instr
+#endif
 #define BSYM(sym)	sym
 
 #endif	/* CONFIG_THUMB2_KERNEL */

Re: [PATCH v2] arm: export "W" macro just for assembly code

[Catalin Marinas]

On Sun, 2009-09-20 at 21:40 +0200, Sebastian Andrzej Siewior wrote:
> Russel, I've added a new patch description for this patch since my
> rename edition was a little larger.

I already added a patch with the modified description in my for-rmk
branch. I'm not sure Russell had time to pull it.

-- 
Catalin

Re: [PATCH v2] arm: export "W" macro just for assembly code

[Russell King - ARM Linux]

On Mon, Sep 21, 2009 at 12:41:28PM +0100, Catalin Marinas wrote:
> On Sun, 2009-09-20 at 21:40 +0200, Sebastian Andrzej Siewior wrote:
> > Russel, I've added a new patch description for this patch since my
> > rename edition was a little larger.
> 
> I already added a patch with the modified description in my for-rmk
> branch. I'm not sure Russell had time to pull it.

It got pulled before you modified it, so we're going to have to live
with it with its silly description now.