Skip to contentSkip to conversation

KVM: PPC: e500: fix BOOKE_INTERRUPT_ALIGNMENT build break

PATCH In review Scott Wood 2 participants 4 messages Feb 7, 2013 – Feb 8, 2013

Subsystems (3)
KVM PowerPC KVM PowerPC
lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 1/1 KVM: PPC: e500: fix BOOKE_INTERRUPT_ALIGNMENT build break

Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE: Handle alignment interrupts") broke the build by adding mismatched parentheses.

Signed-off-by Scott Wood <[email protected]>

---
Against kvm-ppc-queue

 arch/powerpc/kvm/booke_interrupts.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/booke_interrupts.S +2 -2
index 7fa4167..f4bb55c 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 4 lines · Scott Wood

Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE: Handle alignment interrupts") broke the build by adding mismatched parentheses.

Signed-off-by Scott Wood <[email protected]>

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

Quoted 33 lines

---
Against kvm-ppc-queue

arch/powerpc/kvm/booke_interrupts.S | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/booke_interrupts.S +2 -2
index 7fa4167..f4bb55c 100644
@@ -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

Signature · 6 lines
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author
#2 lore raw
Quoted 5 lines · Alexander Graf
Quoted 1 line · Scott Wood

Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE:

Handle

Quoted 8 lines
Quoted 1 line

alignment interrupts") broke the build by adding mismatched

parentheses.

Quoted 2 lines
Signed-off-by Scott Wood <[email protected]>

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

#3 lore raw
Quoted 10 lines · Scott Wood
Quoted 7 lines · Alexander Graf
Quoted 4 lines · Scott Wood

Commit 2765788fcc3dc64920dd2be3d32319b50b1e2813 ("KVM: PPC: BookE: Handle alignment interrupts") broke the build by adding mismatched parentheses.

Signed-off-by Scott Wood <[email protected]>

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