From mboxrd@z Thu Jan 1 00:00:00 1970 From: christoffer.dall@linaro.org (Christoffer Dall) Date: Thu, 31 Jul 2014 15:32:27 +0200 Subject: [PATCH][next] arm64: KVM: GICv3: move system register access to msr_s/mrs_s In-Reply-To: <20140731131947.GT26853@arm.com> References: <1406812599-18631-1-git-send-email-marc.zyngier@arm.com> <20140731131947.GT26853@arm.com> Message-ID: <20140731133227.GA589@cbox> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Jul 31, 2014 at 02:19:47PM +0100, Will Deacon wrote: > On Thu, Jul 31, 2014 at 02:16:39PM +0100, Marc Zyngier wrote: > > Commit 72c583951526 (arm64: gicv3: Allow GICv3 compilation with > > older binutils) changed the way we express the GICv3 system registers, > > but couldn't change the occurences used by KVM as the code wasn't > > merged yet. > > > > Just fix the accessors. > > > > Cc: Will Deacon > > Cc: Catalin Marinas > > Cc: Christoffer Dall > > Signed-off-by: Marc Zyngier > > --- > > -next is currently borked. I suggest we take this patch via the kvmarm tree, > > and only send our PR once the arm64 tree has hit Linus' tree. It contains > > the same dependency on the GIC tree anyway. > > I'm fine with that as long as Paulo doesn't mind waiting for the arm64 stuff > to go in first (I have no reason to delay my pull request, so shouldn't be > an issue). > > If it helps: > > Acked-by: Will Deacon > > I can't help but point out that we wouldn't be in this mess if you'd got > your stuff into -next sooner ;) > Well yes, but it was hard to plan our holidays around the deadlines and unfortunately I couldn't find time to verify the kvmarm branch to make it ready for -next inclusion before I went on holiday this time. In any case, this should be the exception rather than the rule, and I do try to get the next branch ready as soon as possible usually. -Christoffer