From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 1/4] ARM: Allow assembler.h to be used with inline asm
Date: Wed, 9 Oct 2013 15:29:50 +0100 [thread overview]
Message-ID: <1381328993-12724-2-git-send-email-Dave.Martin@arm.com> (raw)
In-Reply-To: <1381328993-12724-1-git-send-email-Dave.Martin@arm.com>
There are a few things in assembler.h that would be useful with
inline asm, but currently assembler.h refuses to be included into C
files.
In particular, the optional feature macros (PLD() and friends) can
be used sensibly with inline asm, with a string argument.
This patch enables the relevant parts of aassembler.h to be
included in C files and used in inline asm.
Since assembler.h by definition can't be included in any C file up
to now, this should not introduce any namespace clashes.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
arch/arm/include/asm/assembler.h | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index fcc1b5b..a71d117 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -16,14 +16,12 @@
#ifndef __ASM_ASSEMBLER_H__
#define __ASM_ASSEMBLER_H__
-#ifndef __ASSEMBLY__
-#error "Only include this from assembly code"
-#endif
-
#include <asm/ptrace.h>
#include <asm/domain.h>
#include <asm/opcodes-virt.h>
+#ifdef __ASSEMBLY__
+
#define IOMEM(x) (x)
/*
@@ -53,6 +51,8 @@
#define put_byte_3 lsl #0
#endif
+#endif /* __ASSEMBLY__ */
+
/*
* Data preload for architectures that support it
*/
@@ -77,6 +77,8 @@
#define CALGN(code...)
#endif
+#ifdef __ASSEMBLY__
+
/*
* Enable and disable interrupts
*/
@@ -376,4 +378,6 @@ THUMB( orr \reg , \reg , #PSR_T_BIT )
#endif
.endm
+#endif /* __ASSEMBLY__ */
+
#endif /* __ASM_ASSEMBLER_H__ */
--
1.7.9.5
next prev parent reply other threads:[~2013-10-09 14:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 14:29 [RFC PATCH 0/4] ARM: Unify const-swabbing and conditional asm Dave Martin
2013-10-09 14:29 ` Dave Martin [this message]
2013-10-09 14:42 ` [RFC PATCH 1/4] ARM: Allow assembler.h to be used with inline asm Russell King - ARM Linux
2013-10-09 15:00 ` Dave Martin
2013-10-09 15:32 ` Nicolas Pitre
2013-10-09 14:29 ` [RFC PATCH 2/4] ARM: Add common compile-time swab32 for asm code Dave Martin
2013-10-09 14:29 ` [RFC PATCH 3/4] ARM: Add const cpu_to_le32 for asm Dave Martin
2013-10-09 14:29 ` [RFC PATCH 4/4] drivers/bus: arm-cci: Fix CCI enable code for BE32 Dave Martin
[not found] <20131009161006.GC2306@localhost.localdomain>
2013-10-09 16:54 ` [RFC PATCH 1/4] ARM: Allow assembler.h to be used with inline asm Nicolas Pitre
[not found] <20131009171202.GD2306@localhost.localdomain>
2013-10-09 17:27 ` Nicolas Pitre
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=1381328993-12724-2-git-send-email-Dave.Martin@arm.com \
--to=dave.martin@arm.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).