]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
arm64/kvm: Fix assembler compatibility of macros
authorGeoff Levand <geoff@infradead.org>
Fri, 31 Oct 2014 23:06:47 +0000 (23:06 +0000)
committerJiri Slaby <jslaby@suse.cz>
Thu, 30 Apr 2015 09:15:11 +0000 (11:15 +0200)
commit5030e3c059fbcf6223a1d386f9b7a1aa940f140e
tree89e291fa6f55ac48e9db4496242e8073ba3d8d98
parent8f4ca4f5b938fbc0598b66c041ced7a2fe82dccf
arm64/kvm: Fix assembler compatibility of macros

commit 286fb1cc32b11c18da3573a8c8c37a4f9da16e30 upstream.

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>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/arm64/include/asm/kvm_arm.h