From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH 03/31] mips/kvm: Fix 32-bitisms in kvm_locore.S Date: Fri, 14 Jun 2013 17:21:35 +0400 Message-ID: <51BB18DF.1080702@cogentembedded.com> References: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com> <1370646215-6543-4-git-send-email-ddaney.cavm@gmail.com> <20130614130933.GE15775@linux-mips.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: David Daney , linux-mips@linux-mips.org, kvm@vger.kernel.org, Sanjay Lal , linux-kernel@vger.kernel.org, David Daney To: Ralf Baechle Return-path: In-Reply-To: <20130614130933.GE15775@linux-mips.org> Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: List-Id: kvm.vger.kernel.org Hello. On 14-06-2013 17:09, Ralf Baechle wrote: >> diff --git a/arch/mips/kvm/kvm_locore.S b/arch/mips/kvm/kvm_locore.S >> index dca2aa6..e86fa2a 100644 >> --- a/arch/mips/kvm/kvm_locore.S >> +++ b/arch/mips/kvm/kvm_locore.S >> @@ -310,7 +310,7 @@ NESTED (MIPSX(GuestException), CALLFRAME_SIZ, ra) >> LONG_S t0, VCPU_R26(k1) >> >> /* Get GUEST k1 and save it in VCPU */ >> - la t1, ~0x2ff >> + PTR_LI t1, ~0x2ff >> mfc0 t0, CP0_EBASE >> and t0, t0, t1 >> LONG_L t0, 0x3000(t0) >> @@ -384,14 +384,14 @@ NESTED (MIPSX(GuestException), CALLFRAME_SIZ, ra) >> mtc0 k0, CP0_DDATA_LO >> >> /* Restore RDHWR access */ >> - la k0, 0x2000000F >> + PTR_LI k0, 0x2000000F >> mtc0 k0, CP0_HWRENA >> >> /* Jump to handler */ >> FEXPORT(__kvm_mips_jump_to_handler) >> /* XXXKYMA: not sure if this is safe, how large is the stack?? */ >> /* Now jump to the kvm_mips_handle_exit() to see if we can deal with this in the kernel */ >> - la t9,kvm_mips_handle_exit >> + PTR_LA t9, kvm_mips_handle_exit >> jalr.hb t9 >> addiu sp,sp, -CALLFRAME_SIZ /* BD Slot */ >> >> @@ -566,7 +566,7 @@ __kvm_mips_return_to_host: >> mtlo k0 >> >> /* Restore RDHWR access */ >> - la k0, 0x2000000F >> + PTR_LI k0, 0x2000000F >> mtc0 k0, CP0_HWRENA > Technically ok, there's only a formatting issue because you indent the > changed lines with tabs while the existing file uses tab characters. I hope you meant the space characters? :-) > I suggest you insert an extra cleanup patch to properly re-indent the > entire file into the series before this one? > So with that sorted: > Acked-by: Ralf Baechle > Ralf WBR, Sergei