diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2015-02-20 13:53:13 +0000 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2015-02-23 09:13:51 +0000 |
commit | f3e39273e0a9a5c9dc78cd667ec3663e97e0e989 (patch) | |
tree | 1c70506707b384e4f713582a8226e6e608430dab /arch/arm64 | |
parent | 115386f89b5415fcdf641faad0d459cd5c07d225 (diff) | |
download | linux-f3e39273e0a9a5c9dc78cd667ec3663e97e0e989.tar.bz2 |
arm64: guard asm/assembler.h against multiple inclusions
asm/assembler.h lacks the usual guard against multiple inclusion,
leading to a compilation failure if it is accidentally included
twice.
Using the classic #ifndef/#define/#endif construct solves the issue.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/include/asm/assembler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 5901480bfdca..750bac4e637e 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -20,6 +20,9 @@ #error "Only include this from assembly code" #endif +#ifndef __ASM_ASSEMBLER_H +#define __ASM_ASSEMBLER_H + #include <asm/ptrace.h> #include <asm/thread_info.h> @@ -155,3 +158,5 @@ lr .req x30 // link register #endif orr \rd, \lbits, \hbits, lsl #32 .endm + +#endif /* __ASM_ASSEMBLER_H */ |