From: Geoff Levand <geoff@infradead.org>
Date: Fri, 31 Oct 2014 23:06:47 +0000 (+0000)
Subject: arm64/kvm: Fix assembler compatibility of macros
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~18^2~55
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=286fb1cc32b11c18da3573a8c8c37a4f9da16e30;p=pandora-kernel.git

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

Reading git-diff-tree failed