On Mon, Oct 27, 2014 at 1:13 PM, Will Deacon <will.deacon at arm.com> wrote: > On Fri, Oct 24, 2014 at 10:24:51AM +0100, Mark Rutland wrote: >> On Fri, Oct 24, 2014 at 12:10:58AM +0100, Geoff Levand wrote: >> > 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)' >> > >> > Signed-off-by: Geoff Levand <geoff at infradead.org> >> >> Thanks for putting this together, Geoff. >> >> Acked-by: Mark Rutland <mark.rutland at arm.com> > > This doesn't apply against -rc2 (see below). If you send a rebased version > of this patch, I'm happy to queue it for 3.19. > > Alternatively, it could go via the kvm tree. Christoffer, Marc, do you have > a preference? (the kexec stuff depends on this, so that's why I was thinking > of queuing it in the arm64 tree). > I'm fine with you picking it up. Thanks, -Chrsitoffer
