arm64/kvm: Fix assembler compatibility of macros
authorGeoff Levand <geoff@infradead.org>
Fri, 31 Oct 2014 23:06:47 +0000 (23:06 +0000)
committerWill Deacon <will.deacon@arm.com>
Thu, 6 Nov 2014 17:25:28 +0000 (17:25 +0000)
commit286fb1cc32b11c18da3573a8c8c37a4f9da16e30
treeb27e266edb55a4bde3e1a67b5ad56f797aa5b8fe
parentd8c6d8b877cb2a216e933ce11954632a9daeb362
arm64/kvm: Fix assembler compatibility of macros

Some of the macros defined in kvm_arm.h are useful in assembly files, but are
not compatible with the assembler.  Change any C language integer constant
definitions using appended U, UL, or ULL to the UL() preprocessor macro.  Also,
add a preprocessor include of the asm/memory.h file which defines the UL()
macro.

Fixes build errors like these when using kvm_arm.h in assembly
source files:

  Error: unexpected characters following instruction at operand 3 -- `and x0,x1,#((1U<<25)-1)'

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/include/asm/kvm_arm.h