Patchwork KVM: PPC: e500: fix BOOKE_INTERRUPT_ALIGNMENT build break

login
register
mail settings
Submitter Scott Wood
Date Feb. 7, 2013, 10:17 p.m.
Message ID <20130207221759.GA7315@home.buserror.net>
Download mbox | patch
Permalink /patch/219009/
State New
Headers show

Comments

Scott Wood - Feb. 7, 2013, 10:17 p.m.
Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE: Handle
alignment interrupts") broke the build by adding mismatched parentheses.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
Against kvm-ppc-queue

 arch/powerpc/kvm/booke_interrupts.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Alexander Graf - Feb. 8, 2013, 12:20 a.m.
On 07.02.2013, at 23:17, Scott Wood wrote:

> Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE: Handle
> alignment interrupts") broke the build by adding mismatched parentheses.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>

Thanks a lot for catching this.

This patch hasn't gone into kvm-ppc-next yet and is still in my (partially untested) kvm-ppc-queue branch. Would you mind if I just squash this fix with the original commit? That way we don't break bisectability later.


Alex

> ---
> Against kvm-ppc-queue
> 
> arch/powerpc/kvm/booke_interrupts.S |    4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
> index 7fa4167..f4bb55c 100644
> --- a/arch/powerpc/kvm/booke_interrupts.S
> +++ b/arch/powerpc/kvm/booke_interrupts.S
> @@ -45,13 +45,13 @@
>                         (1<<BOOKE_INTERRUPT_DEBUG))
> 
> #define NEED_DEAR_MASK ((1<<BOOKE_INTERRUPT_DATA_STORAGE) | \
> -                        (1<<BOOKE_INTERRUPT_DTLB_MISS)) | \
> +                        (1<<BOOKE_INTERRUPT_DTLB_MISS) | \
>                         (1<<BOOKE_INTERRUPT_ALIGNMENT))
> 
> #define NEED_ESR_MASK ((1<<BOOKE_INTERRUPT_DATA_STORAGE) | \
>                        (1<<BOOKE_INTERRUPT_INST_STORAGE) | \
>                        (1<<BOOKE_INTERRUPT_PROGRAM) | \
> -                       (1<<BOOKE_INTERRUPT_DTLB_MISS)) | \
> +                       (1<<BOOKE_INTERRUPT_DTLB_MISS) | \
>                        (1<<BOOKE_INTERRUPT_ALIGNMENT))
> 
> .macro KVM_HANDLER ivor_nr scratch srr0
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Scott Wood - Feb. 8, 2013, 12:22 a.m.
On 02/07/2013 06:20:33 PM, Alexander Graf wrote:
> 
> On 07.02.2013, at 23:17, Scott Wood wrote:
> 
> > Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE:  
> Handle
> > alignment interrupts") broke the build by adding mismatched  
> parentheses.
> >
> > Signed-off-by: Scott Wood <scottwood@freescale.com>
> 
> Thanks a lot for catching this.
> 
> This patch hasn't gone into kvm-ppc-next yet and is still in my  
> (partially untested) kvm-ppc-queue branch. Would you mind if I just  
> squash this fix with the original commit? That way we don't break  
> bisectability later.

Go ahead.

-Scott
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - Feb. 8, 2013, 12:52 a.m.
On 08.02.2013, at 01:22, Scott Wood wrote:

> On 02/07/2013 06:20:33 PM, Alexander Graf wrote:
>> On 07.02.2013, at 23:17, Scott Wood wrote:
>> > Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE: Handle
>> > alignment interrupts") broke the build by adding mismatched parentheses.
>> >
>> > Signed-off-by: Scott Wood <scottwood@freescale.com>
>> Thanks a lot for catching this.
>> This patch hasn't gone into kvm-ppc-next yet and is still in my (partially untested) kvm-ppc-queue branch. Would you mind if I just squash this fix with the original commit? That way we don't break bisectability later.
> 
> Go ahead.

Thanks, done :)


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 7fa4167..f4bb55c 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -45,13 +45,13 @@ 
                         (1<<BOOKE_INTERRUPT_DEBUG))
 
 #define NEED_DEAR_MASK ((1<<BOOKE_INTERRUPT_DATA_STORAGE) | \
-                        (1<<BOOKE_INTERRUPT_DTLB_MISS)) | \
+                        (1<<BOOKE_INTERRUPT_DTLB_MISS) | \
                         (1<<BOOKE_INTERRUPT_ALIGNMENT))
 
 #define NEED_ESR_MASK ((1<<BOOKE_INTERRUPT_DATA_STORAGE) | \
                        (1<<BOOKE_INTERRUPT_INST_STORAGE) | \
                        (1<<BOOKE_INTERRUPT_PROGRAM) | \
-                       (1<<BOOKE_INTERRUPT_DTLB_MISS)) | \
+                       (1<<BOOKE_INTERRUPT_DTLB_MISS) | \
                        (1<<BOOKE_INTERRUPT_ALIGNMENT))
 
 .macro KVM_HANDLER ivor_nr scratch srr0