Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / powerpc / lib / sstep.c

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index 8342188..855457e 100644 (file)
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -219,10 +219,13 @@ static nokprobe_inline unsigned long mlsd_8lsd_ea(unsigned int instr,
                ea += regs->gpr[ra];
        else if (!prefix_r && !ra)
                ; /* Leave ea as is */
-       else if (prefix_r && !ra)
+       else if (prefix_r)
                ea += regs->nip;
-       else if (prefix_r && ra)
-               ; /* Invalid form. Should already be checked for by caller! */
+
+       /*
+        * (prefix_r && ra) is an invalid form. Should already be
+        * checked for by caller!
+        */
 
        return ea;
 }