Commit b2f5b43a authored Feb 20, 2015 by Marc Zyngier Committed by Sami Tolvanen Nov 18, 2016

UPSTREAM: 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>

Bug: 31432001
Change-Id: Ia931aa27b00fb9988014ed78963fcf243e186f39
(cherry picked from commit f3e39273e0a9a5c9dc78cd667ec3663e97e0e989)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>

parent 1e0b1a0c

arch/arm64/include/asm/assembler.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -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 */