* [PATCH -next] Fix "W" macro in unified.h
@ 2009-09-05 21:02 Alexey Dobriyan
2009-09-07 9:00 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Alexey Dobriyan @ 2009-09-05 21:02 UTC (permalink / raw)
To: catalin.marinas; +Cc: linux-next, sfr
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>
---
arch/arm/include/asm/unified.h | 4 ++++
1 file changed, 4 insertions(+)
--- 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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -next] Fix "W" macro in unified.h
2009-09-05 21:02 [PATCH -next] Fix "W" macro in unified.h Alexey Dobriyan
@ 2009-09-07 9:00 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2009-09-07 9:00 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: linux-next, sfr, Russell King - ARM Linux
On Sun, 2009-09-06 at 01:02 +0400, Alexey Dobriyan wrote:
> 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>
Thanks for this. I added it as a new patch since Russell already merged
the current thumb-2 branch and I don't want to modify the history.
The unified.h file is automatically included in the .S files only. But
it seems that it gets included in C files via asm/uaccess.h, so this
patch makes sense.
Russell, would you like the patch on top of my thumb-2 git branch
(should only pull one patch as I haven't rebased it) or to the patch
system (but Alexey should send it so that the author information is
preserved)?
Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-07 9:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-05 21:02 [PATCH -next] Fix "W" macro in unified.h Alexey Dobriyan
2009-09-07 9:00 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox