Commit f3e39273 authored by Marc Zyngier's avatar Marc Zyngier Committed by Will Deacon
Browse files

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: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 115386f8
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#error "Only include this from assembly code" #error "Only include this from assembly code"
#endif #endif
#ifndef __ASM_ASSEMBLER_H
#define __ASM_ASSEMBLER_H
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
...@@ -155,3 +158,5 @@ lr .req x30 // link register ...@@ -155,3 +158,5 @@ lr .req x30 // link register
#endif #endif
orr \rd, \lbits, \hbits, lsl #32 orr \rd, \lbits, \hbits, lsl #32
.endm .endm
#endif /* __ASM_ASSEMBLER_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment