1 files changed, 45 insertions, 44 deletions

diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 169ec3a7156c..9c9c8fcdfbdc 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -90,7 +90,7 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
         p->ainsn.target_br_reg = 0;
 
         /* Check for Break instruction
-         * Bits 37:40 Major opcode to be zero
+         * Bits 37:40 Major opcode to be zero
          * Bits 27:32 X6 to be zero
          * Bits 32:35 X3 to be zero
          */
@@ -104,19 +104,19 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
                 switch (major_opcode) {
                   case INDIRECT_CALL_OPCODE:
                         p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
-                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
-                        break;
+                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
+                        break;
                   case IP_RELATIVE_PREDICT_OPCODE:
                   case IP_RELATIVE_BRANCH_OPCODE:
                         p->ainsn.inst_flag |= INST_FLAG_FIX_RELATIVE_IP_ADDR;
-                        break;
+                        break;
                   case IP_RELATIVE_CALL_OPCODE:
-                        p->ainsn.inst_flag |= INST_FLAG_FIX_RELATIVE_IP_ADDR;
-                        p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
-                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
-                        break;
+                        p->ainsn.inst_flag |= INST_FLAG_FIX_RELATIVE_IP_ADDR;
+                        p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
+                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
+                        break;
                 }
-        } else if (bundle_encoding[template][slot] == X) {
+        } else if (bundle_encoding[template][slot] == X) {
                 switch (major_opcode) {
                   case LONG_CALL_OPCODE:
                         p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
@@ -258,18 +258,18 @@ static void __kprobes get_kprobe_inst(bundle_t *bundle, uint slot,
 
         switch (slot) {
           case 0:
-                *major_opcode = (bundle->quad0.slot0 >> SLOT0_OPCODE_SHIFT);
-                *kprobe_inst = bundle->quad0.slot0;
-                break;
+                *major_opcode = (bundle->quad0.slot0 >> SLOT0_OPCODE_SHIFT);
+                *kprobe_inst = bundle->quad0.slot0;
+                  break;
           case 1:
-                *major_opcode = (bundle->quad1.slot1_p1 >> SLOT1_p1_OPCODE_SHIFT);
-                kprobe_inst_p0 = bundle->quad0.slot1_p0;
-                kprobe_inst_p1 = bundle->quad1.slot1_p1;
-                *kprobe_inst = kprobe_inst_p0 | (kprobe_inst_p1 << (64-46));
+                *major_opcode = (bundle->quad1.slot1_p1 >> SLOT1_p1_OPCODE_SHIFT);
+                kprobe_inst_p0 = bundle->quad0.slot1_p0;
+                kprobe_inst_p1 = bundle->quad1.slot1_p1;
+                *kprobe_inst = kprobe_inst_p0 | (kprobe_inst_p1 << (64-46));
                 break;
           case 2:
-                *major_opcode = (bundle->quad1.slot2 >> SLOT2_OPCODE_SHIFT);
-                *kprobe_inst = bundle->quad1.slot2;
+                *major_opcode = (bundle->quad1.slot2 >> SLOT2_OPCODE_SHIFT);
+                *kprobe_inst = bundle->quad1.slot2;
                 break;
         }
 }
@@ -290,11 +290,11 @@ static int __kprobes valid_kprobe_addr(int template, int slot,
                 return -EINVAL;
         }
 
-        if (in_ivt_functions(addr)) {
-                printk(KERN_WARNING "Kprobes can't be inserted inside "
+        if (in_ivt_functions(addr)) {
+                printk(KERN_WARNING "Kprobes can't be inserted inside "
                                 "IVT functions at 0x%lx\n", addr);
-                return -EINVAL;
-        }
+                return -EINVAL;
+        }
 
         if (slot == 1 && bundle_encoding[template][1] != L) {
                 printk(KERN_WARNING "Inserting kprobes on slot #1 "
@@ -424,14 +424,14 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         bundle_t *bundle;
 
         bundle = &((kprobe_opcode_t *)kprobe_addr)->bundle;
-        template = bundle->quad0.template;
+        template = bundle->quad0.template;
 
         if(valid_kprobe_addr(template, slot, addr))
                 return -EINVAL;
 
         /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */
-        if (slot == 1 && bundle_encoding[template][1] == L)
-                slot++;
+        if (slot == 1 && bundle_encoding[template][1] == L)
+                slot++;
 
         /* Get kprobe_inst and major_opcode from the bundle */
         get_kprobe_inst(bundle, slot, &kprobe_inst, &major_opcode);
@@ -489,21 +489,22 @@ void __kprobes arch_remove_kprobe(struct kprobe *p)
  */
 static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
-        unsigned long bundle_addr = (unsigned long) (&p->ainsn.insn->bundle);
-        unsigned long resume_addr = (unsigned long)p->addr & ~0xFULL;
-        unsigned long template;
-        int slot = ((unsigned long)p->addr & 0xf);
+        unsigned long bundle_addr = (unsigned long) (&p->ainsn.insn->bundle);
+        unsigned long resume_addr = (unsigned long)p->addr & ~0xFULL;
+        unsigned long template;
+        int slot = ((unsigned long)p->addr & 0xf);
 
         template = p->ainsn.insn->bundle.quad0.template;
 
-        if (slot == 1 && bundle_encoding[template][1] == L)
-                slot = 2;
+        if (slot == 1 && bundle_encoding[template][1] == L)
+                slot = 2;
 
         if (p->ainsn.inst_flag) {
 
                 if (p->ainsn.inst_flag & INST_FLAG_FIX_RELATIVE_IP_ADDR) {
                         /* Fix relative IP address */
-                        regs->cr_iip = (regs->cr_iip - bundle_addr) + resume_addr;
+                        regs->cr_iip = (regs->cr_iip - bundle_addr) +
+                                        resume_addr;
                 }
 
                 if (p->ainsn.inst_flag & INST_FLAG_FIX_BRANCH_REG) {
@@ -540,18 +541,18 @@ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
         }
 
         if (slot == 2) {
-                if (regs->cr_iip == bundle_addr + 0x10) {
-                        regs->cr_iip = resume_addr + 0x10;
-                }
-        } else {
-                if (regs->cr_iip == bundle_addr) {
-                        regs->cr_iip = resume_addr;
-                }
+                if (regs->cr_iip == bundle_addr + 0x10) {
+                        regs->cr_iip = resume_addr + 0x10;
+                }
+        } else {
+                if (regs->cr_iip == bundle_addr) {
+                        regs->cr_iip = resume_addr;
+                }
         }
 
 turn_ss_off:
-        /* Turn off Single Step bit */
-        ia64_psr(regs)->ss = 0;
+        /* Turn off Single Step bit */
+        ia64_psr(regs)->ss = 0;
 }
 
 static void __kprobes prepare_ss(struct kprobe *p, struct pt_regs *regs)
@@ -587,7 +588,7 @@ static int __kprobes is_ia64_break_inst(struct pt_regs *regs)
 
         /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */
         if (slot == 1 && bundle_encoding[template][1] == L)
-                slot++;
+                slot++;
 
         /* Get Kprobe probe instruction at given slot*/
         get_kprobe_inst(&bundle, slot, &kprobe_inst, &major_opcode);
@@ -627,7 +628,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
                 if (p) {
                         if ((kcb->kprobe_status == KPROBE_HIT_SS) &&
                              (p->ainsn.inst_flag == INST_FLAG_BREAK_INST)) {
-                                ia64_psr(regs)->ss = 0;
+                                ia64_psr(regs)->ss = 0;
                                 goto no_kprobe;
                         }
                         /* We have reentered the pre_kprobe_handler(), since
@@ -887,7 +888,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
          * fix the return address to our jprobe_inst_return() function
          * in the jprobes.S file
          */
-        regs->b0 = ((struct fnptr *)(jprobe_inst_return))->ip;
+        regs->b0 = ((struct fnptr *)(jprobe_inst_return))->ip;
 
         return 1;
 }